diff --git a/app/src/androidTest/java/net/schueller/peertube/ExampleInstrumentedTest.java b/app/src/androidTest/java/net/schueller/peertube/ExampleInstrumentedTest.java
deleted file mode 100644
index 0c0fe04..0000000
--- a/app/src/androidTest/java/net/schueller/peertube/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.schueller.peertube;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("net.schueller.peertube", appContext.getPackageName());
-    }
-}
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
deleted file mode 100644
index 8433983..0000000
Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java b/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
deleted file mode 100644
index c14482e..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.schueller.peertube.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-import com.google.android.material.bottomnavigation.LabelVisibilityMode;
-import com.google.android.material.navigation.NavigationBarView;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.typeface.library.fontawesome.FontAwesome;
-import com.squareup.picasso.Picasso;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.adapter.ChannelAdapter;
-import net.schueller.peertube.adapter.MultiViewRecycleViewAdapter;
-import net.schueller.peertube.helper.APIUrlHelper;
-import net.schueller.peertube.helper.ErrorHelper;
-import net.schueller.peertube.helper.MetaDataHelper;
-import net.schueller.peertube.model.Account;
-import net.schueller.peertube.model.Avatar;
-import net.schueller.peertube.model.ChannelList;
-import net.schueller.peertube.model.VideoList;
-import net.schueller.peertube.network.GetUserService;
-import net.schueller.peertube.network.GetVideoDataService;
-import net.schueller.peertube.network.RetrofitInstance;
-
-
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.Set;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-
-public class AccountActivity extends CommonActivity {
-
-    private String TAG = "AccountActivity";
-    private String apiBaseURL;
-
-    private Integer videosStart, videosCount, videosCurrentStart;
-    private String videosFilter, videosSort, videosNsfw;
-    private Set<String> videosLanguages;
-
-    private ChannelAdapter channelAdapter;
-    private MultiViewRecycleViewAdapter mMultiViewRecycleViewAdapter;
-
-    private RecyclerView recyclerViewVideos;
-    private RecyclerView recyclerViewChannels;
-
-    private SwipeRefreshLayout swipeRefreshLayoutVideos;
-    private SwipeRefreshLayout swipeRefreshLayoutChannels;
-    private CoordinatorLayout aboutView;
-    //private TextView emptyView;
-
-    private Boolean isLoadingVideos;
-
-    private GetUserService userService;
-
-    private String displayNameAndHost;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_account);
-
-        apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
-
-        userService = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetUserService.class);
-
-        recyclerViewVideos = findViewById(R.id.account_video_recyclerView);
-        recyclerViewChannels = findViewById(R.id.account_channel_recyclerView);
-
-        swipeRefreshLayoutVideos = findViewById(R.id.account_swipeRefreshLayout_videos);
-        swipeRefreshLayoutChannels = findViewById(R.id.account_swipeRefreshLayout_channels);
-        aboutView = findViewById(R.id.account_about);
-
-        RecyclerView.LayoutManager layoutManagerVideos = new LinearLayoutManager(AccountActivity.this);
-        recyclerViewVideos.setLayoutManager(layoutManagerVideos);
-
-        RecyclerView.LayoutManager layoutManagerVideosChannels = new LinearLayoutManager(AccountActivity.this);
-        recyclerViewChannels.setLayoutManager(layoutManagerVideosChannels);
-
-        mMultiViewRecycleViewAdapter = new MultiViewRecycleViewAdapter();
-        recyclerViewVideos.setAdapter(mMultiViewRecycleViewAdapter);
-
-        channelAdapter = new ChannelAdapter(new ArrayList<>(), AccountActivity.this);
-        recyclerViewChannels.setAdapter(channelAdapter);
-
-
-        swipeRefreshLayoutVideos.setOnRefreshListener(() -> {
-            // Refresh items
-            if (!isLoadingVideos) {
-                videosCurrentStart = 0;
-                loadAccountVideos(displayNameAndHost);
-            }
-        });
-
-        // get video ID
-        Intent intent = getIntent();
-        displayNameAndHost = intent.getStringExtra(VideoListActivity.EXTRA_ACCOUNTDISPLAYNAME);
-        Log.v(TAG, "click: " + displayNameAndHost);
-
-
-        createBottomBarNavigation();
-
-        videosStart = 0;
-        videosCount = 25;
-        videosCurrentStart = 0;
-        videosFilter = "";
-        videosSort = "-publishedAt";
-        videosNsfw = "";
-
-
-        // Attaching the layout to the toolbar object
-        Toolbar toolbar = findViewById(R.id.tool_bar_account);
-        // Setting toolbar as the ActionBar with setSupportActionBar() call
-        setSupportActionBar(toolbar);
-
-        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
-        getSupportActionBar().setTitle(displayNameAndHost);
-
-        loadAccountVideos(displayNameAndHost);
-
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish(); // close this activity as oppose to navigating up
-
-        return false;
-    }
-
-    private void loadAccount(String ownerString) {
-
-        // get video details from api
-        Call<Account> call = userService.getAccount(ownerString);
-
-        call.enqueue(new Callback<Account>() {
-            @Override
-            public void onResponse(@NonNull Call<Account> call, @NonNull Response<Account> response) {
-
-
-                if (response.isSuccessful()) {
-                    Account account = response.body();
-
-                    String owner = MetaDataHelper.getOwnerString(account,
-                            AccountActivity.this, true
-                    );
-
-
-                    // set view data
-                    TextView ownerStringView = findViewById(R.id.account_owner_string);
-                    ownerStringView.setText(owner);
-
-                    TextView followers = findViewById(R.id.account_followers);
-                    followers.setText(String.valueOf(account.getFollowersCount()));
-
-                    TextView description = findViewById(R.id.account_description);
-                    description.setText(account.getDescription());
-
-                    TextView joined = findViewById(R.id.account_joined);
-                    joined.setText(account.getCreatedAt().toString());
-
-
-                    ImageView accountAvatar = findViewById(R.id.account_avatar);
-
-                    // set Avatar
-                    Avatar avatar = account.getAvatar();
-                    if (avatar != null) {
-                        String avatarPath = avatar.getPath();
-                        Picasso.get()
-                                .load(APIUrlHelper.getUrl(AccountActivity.this) + avatarPath)
-                                .into(accountAvatar);
-                    }
-
-                } else {
-                    ErrorHelper.showToastFromCommunicationError( AccountActivity.this, null );
-                }
-
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<Account> call, @NonNull Throwable t) {
-                Log.wtf(TAG, t.fillInStackTrace());
-                ErrorHelper.showToastFromCommunicationError( AccountActivity.this, t );
-            }
-        });
-
-    }
-
-
-    private void loadAccountVideos(String displayNameAndHost) {
-
-        isLoadingVideos = false;
-
-        GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetVideoDataService.class);
-        Call<VideoList> call;
-
-        call = service.getAccountVideosData(displayNameAndHost, videosStart, videosCount, videosSort);
-
-        call.enqueue(new Callback<VideoList>() {
-            @Override
-            public void onResponse(@NonNull Call<VideoList> call, @NonNull Response<VideoList> response) {
-
-                Log.v(TAG, response.toString());
-
-                if (response.isSuccessful()) {
-                    if (videosCurrentStart == 0) {
-                        mMultiViewRecycleViewAdapter.clearData();
-                    }
-
-                    if (response.body() != null) {
-                        mMultiViewRecycleViewAdapter.setVideoData(response.body().getVideos());
-                    }
-
-                } else{
-                    ErrorHelper.showToastFromCommunicationError( AccountActivity.this, null );
-                }
-
-                isLoadingVideos = false;
-                swipeRefreshLayoutVideos.setRefreshing(false);
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<VideoList> call, @NonNull Throwable t) {
-                Log.wtf("err", t.fillInStackTrace());
-                ErrorHelper.showToastFromCommunicationError( AccountActivity.this, t );
-                isLoadingVideos = false;
-                swipeRefreshLayoutVideos.setRefreshing(false);
-            }
-        });
-    }
-
-    private void loadAccountChannels(String displayNameAndHost) {
-
-        // get video details from api
-        Call<ChannelList> call = userService.getAccountChannels(displayNameAndHost);
-
-        call.enqueue(new Callback<ChannelList>() {
-            @Override
-            public void onResponse(@NonNull Call<ChannelList> call, @NonNull Response<ChannelList> response) {
-
-
-                if (response.isSuccessful()) {
-                    ChannelList channelList = response.body();
-
-
-
-                } else {
-                    ErrorHelper.showToastFromCommunicationError( AccountActivity.this, null );
-                }
-
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<ChannelList> call, @NonNull Throwable t) {
-                Log.wtf(TAG, t.fillInStackTrace());
-                ErrorHelper.showToastFromCommunicationError( AccountActivity.this, t );
-            }
-        });
-    }
-
-
-
-    private void createBottomBarNavigation() {
-
-        // Get Bottom Navigation
-        BottomNavigationView navigation = findViewById(R.id.account_navigation);
-
-        // Always show text label
-        navigation.setLabelVisibilityMode(NavigationBarView.LABEL_VISIBILITY_LABELED);
-
-        // Add Icon font
-        Menu navMenu = navigation.getMenu();
-        navMenu.findItem(R.id.account_navigation_about).setIcon(
-                new IconicsDrawable(this, FontAwesome.Icon.faw_user));
-        navMenu.findItem(R.id.account_navigation_channels).setIcon(
-                new IconicsDrawable(this, FontAwesome.Icon.faw_list));
-        navMenu.findItem(R.id.account_navigation_videos).setIcon(
-                new IconicsDrawable(this, FontAwesome.Icon.faw_video));
-
-        // Click Listener
-        navigation.setOnNavigationItemSelectedListener(menuItem -> {
-            switch (menuItem.getItemId()) {
-                case R.id.account_navigation_about:
-
-                    swipeRefreshLayoutVideos.setVisibility(View.GONE);
-                    swipeRefreshLayoutChannels.setVisibility(View.GONE);
-                    aboutView.setVisibility(View.VISIBLE);
-                    loadAccount(displayNameAndHost);
-
-                    return true;
-                case R.id.account_navigation_channels:
-
-                    swipeRefreshLayoutVideos.setVisibility(View.GONE);
-                    swipeRefreshLayoutChannels.setVisibility(View.VISIBLE);
-                    aboutView.setVisibility(View.GONE);
-                    loadAccountChannels(displayNameAndHost);
-
-                    return true;
-                case R.id.account_navigation_videos:
-
-                    swipeRefreshLayoutVideos.setVisibility(View.VISIBLE);
-                    swipeRefreshLayoutChannels.setVisibility(View.GONE);
-                    aboutView.setVisibility(View.GONE);
-                    loadAccountVideos(displayNameAndHost);
-
-                    return true;
-
-            }
-            return false;
-        });
-
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/activity/CommonActivity.java b/app/src/main/java/net/schueller/peertube/activity/CommonActivity.java
deleted file mode 100644
index d68ffe4..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/CommonActivity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.schueller.peertube.activity;
-
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-
-import net.schueller.peertube.R;
-
-import java.util.Locale;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-
-public class CommonActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Set Night Mode
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
-        AppCompatDelegate.setDefaultNightMode(sharedPref.getBoolean(getString(R.string.pref_dark_mode_key), false) ?
-                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
-
-        // Set theme
-        setTheme(getResources().getIdentifier(
-                sharedPref.getString(
-                        getString(R.string.pref_theme_key),
-                        getString(R.string.app_default_theme)
-                ),
-                "style",
-                getPackageName())
-        );
-
-        // Set language
-        String countryCode = sharedPref.getString(getString(R.string.pref_language_app_key), null);
-
-        if (countryCode == null) {
-            return;
-        }
-
-        setLocale(countryCode);
-    }
-
-
-    public void setLocale(String languageCode) {
-
-        Locale locale = new Locale(languageCode);
-
-        //Neither Chinese language choice was working, found this fix on stack overflow
-        if (languageCode.equals("zh-rCN"))
-            locale = Locale.SIMPLIFIED_CHINESE;
-        if (languageCode.equals("zh-rTW"))
-            locale = Locale.TRADITIONAL_CHINESE;
-
-        Locale.setDefault(locale);
-
-        Resources resources = getResources();
-        Configuration config = resources.getConfiguration();
-        config.setLocale(locale);
-        resources.updateConfiguration(config, resources.getDisplayMetrics());
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
deleted file mode 100644
index 57bc0b4..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.schueller.peertube.activity;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import com.squareup.picasso.Picasso;
-import net.schueller.peertube.R;
-import net.schueller.peertube.helper.APIUrlHelper;
-import net.schueller.peertube.helper.ErrorHelper;
-import net.schueller.peertube.model.Avatar;
-import net.schueller.peertube.model.Me;
-import net.schueller.peertube.network.GetUserService;
-import net.schueller.peertube.network.RetrofitInstance;
-import net.schueller.peertube.network.Session;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-import java.util.Objects;
-
-import static net.schueller.peertube.application.AppApplication.getContext;
-
-public class MeActivity extends CommonActivity {
-
-
-    private static final String TAG = "MeActivity";
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu_top_account, menu);
-
-        return true;
-    }
-
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish(); // close this activity as oppose to navigating up
-
-        return false;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_me);
-
-        // Attaching the layout to the toolbar object
-        Toolbar toolbar = findViewById(R.id.tool_bar_me);
-        // Setting toolbar as the ActionBar with setSupportActionBar() call
-        setSupportActionBar(toolbar);
-        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
-
-        LinearLayout account = findViewById(R.id.a_me_account_line);
-        LinearLayout playlist = findViewById(R.id.a_me_playlist);
-        LinearLayout settings = findViewById(R.id.a_me_settings);
-        LinearLayout help = findViewById(R.id.a_me_helpnfeedback);
-
-        TextView logout = findViewById(R.id.a_me_logout);
-
-        playlist.setOnClickListener(view -> {
-            Intent playlistActivity = new Intent(getContext(), PlaylistActivity.class);
-            startActivity(playlistActivity);
-        });
-
-        settings.setOnClickListener(view -> {
-            Intent settingsActivity = new Intent(getContext(), SettingsActivity.class);
-            //overridePendingTransition(R.anim.slide_in_bottom, 0);
-            startActivity(settingsActivity);
-        });
-
-        help.setOnClickListener(view -> {
-            String url = "https://github.com/sschueller/peertube-android/issues";
-            Intent i = new Intent(Intent.ACTION_VIEW);
-            i.setData(Uri.parse(url));
-            startActivity(i);
-        });
-
-        logout.setOnClickListener(view -> {
-            Session.getInstance().invalidate();
-            account.setVisibility(View.GONE);
-        });
-
-        getUserData();
-    }
-
-    private void getUserData() {
-
-
-        String apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
-        String baseURL = APIUrlHelper.getUrl(this);
-
-        GetUserService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetUserService.class);
-
-        Call<Me> call = service.getMe();
-
-        call.enqueue(new Callback<Me>() {
-
-            final LinearLayout account = findViewById(R.id.a_me_account_line);
-
-            @Override
-            public void onResponse(@NonNull Call<Me> call, @NonNull Response<Me> response) {
-
-
-                if (response.isSuccessful()) {
-
-                    Me me = response.body();
-
-                    Log.d(TAG, response.body().toString());
-
-                    TextView username = findViewById(R.id.a_me_username);
-                    TextView email = findViewById(R.id.a_me_email);
-                    ImageView avatarView = findViewById(R.id.a_me_avatar);
-
-
-                    username.setText(me.getUsername());
-                    email.setText(me.getEmail());
-
-                    Avatar avatar = me.getAccount().getAvatar();
-                    if (avatar != null) {
-                        String avatarPath = avatar.getPath();
-                        Picasso.get()
-                                .load(baseURL + avatarPath)
-                                .into(avatarView);
-                    }
-
-                    account.setVisibility(View.VISIBLE);
-
-                } else {
-                    account.setVisibility(View.GONE);
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<Me> call, @NonNull Throwable t) {
-                ErrorHelper.showToastFromCommunicationError(MeActivity.this, t);
-                account.setVisibility(View.GONE);
-            }
-        });
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        getUserData();
-
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/activity/PlaylistActivity.kt b/app/src/main/java/net/schueller/peertube/activity/PlaylistActivity.kt
deleted file mode 100644
index 30b364a..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/PlaylistActivity.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.activity
-
-import android.app.AlertDialog
-import android.content.DialogInterface
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.viewModels
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import net.schueller.peertube.R
-import net.schueller.peertube.adapter.MultiViewRecyclerViewHolder
-import net.schueller.peertube.adapter.PlaylistAdapter
-import net.schueller.peertube.database.Video
-import net.schueller.peertube.database.VideoViewModel
-import net.schueller.peertube.databinding.ActivityPlaylistBinding
-
-class PlaylistActivity : CommonActivity() {
-
-    private val TAG = "PlaylistAct"
-
-    private val mVideoViewModel: VideoViewModel by viewModels()
-
-    private lateinit var mBinding: ActivityPlaylistBinding
-
-    override fun onSupportNavigateUp(): Boolean {
-        finish() // close this activity as oppose to navigating up
-        return false
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        mBinding = ActivityPlaylistBinding.inflate(layoutInflater)
-        setContentView(mBinding.root)
-
-        // Setting toolbar as the ActionBar with setSupportActionBar() call
-        setSupportActionBar(mBinding.toolBarServerAddressBook)
-        supportActionBar?.apply {
-            setDisplayHomeAsUpEnabled(true)
-            setHomeAsUpIndicator(R.drawable.ic_baseline_close_24)
-        }
-
-        showServers()
-    }
-
-    private fun onVideoClick(video: Video) {
-        val intent = Intent(this, VideoPlayActivity::class.java)
-        intent.putExtra(MultiViewRecyclerViewHolder.EXTRA_VIDEOID, video.videoUUID)
-        startActivity(intent)
-    }
-
-    private fun showServers() {
-        val adapter = PlaylistAdapter(mutableListOf(), { onVideoClick(it) }).also {
-            mBinding.serverListRecyclerview.adapter = it
-        }
-
-        // Delete items on swipe
-        val helper = ItemTouchHelper(
-                object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
-                    override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-                        return false
-                    }
-
-                    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-                        AlertDialog.Builder(this@PlaylistActivity)
-                                .setTitle(getString(R.string.remove_video))
-                                .setMessage(getString(R.string.remove_video_warning_message))
-                                .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                                    val position = viewHolder.bindingAdapterPosition
-                                    val video = adapter.getVideoAtPosition(position)
-                                    // Delete the video
-                                    mVideoViewModel.delete(video)
-                                }
-                                .setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int -> adapter.notifyItemChanged(viewHolder.bindingAdapterPosition) }
-                                .setIcon(android.R.drawable.ic_dialog_alert)
-                                .show()
-                    }
-                })
-        helper.attachToRecyclerView(mBinding.serverListRecyclerview)
-
-        // Update the cached copy of the words in the adapter.
-        mVideoViewModel.allVideos.observe(this, { videos: List<Video> ->
-            adapter.setVideos(videos)
-        })
-    }
-
-    companion object
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java b/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
deleted file mode 100644
index 9d9463a..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.activity;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.adapter.ServerSearchAdapter;
-import net.schueller.peertube.helper.APIUrlHelper;
-import net.schueller.peertube.helper.ErrorHelper;
-import net.schueller.peertube.model.ServerList;
-import net.schueller.peertube.network.GetServerListDataService;
-import net.schueller.peertube.network.RetrofitInstance;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-public class SearchServerActivity extends CommonActivity {
-
-    private ServerSearchAdapter serverAdapter;
-    private SwipeRefreshLayout swipeRefreshLayout;
-    private EditText searchTextView;
-
-    private final static String TAG = "SearchServerActivity";
-
-    private int currentStart = 0;
-    private final int count = 12;
-    private String lastSearchtext = "";
-
-    private TextView emptyView;
-    private RecyclerView recyclerView;
-
-    private boolean isLoading = false;
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish(); // close this activity as oppose to navigating up
-        return false;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_search_server);
-
-        // Attaching the layout to the toolbar object
-        Toolbar toolbar = findViewById(R.id.tool_bar_server_selection);
-        // Setting toolbar as the ActionBar with setSupportActionBar() call
-        setSupportActionBar(toolbar);
-        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
-
-        loadList();
-
-    }
-
-    TextView.OnEditorActionListener onSearchTextValidated = ( textView, i, keyEvent ) -> {
-        if ( keyEvent != null && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                || i == EditorInfo.IME_ACTION_GO ) {
-            loadServers(currentStart, count, textView.getText().toString());
-        }
-        return false;
-    };
-
-    private void loadList() {
-
-        recyclerView = findViewById(R.id.serverRecyclerView);
-        swipeRefreshLayout = findViewById(R.id.serversSwipeRefreshLayout);
-        searchTextView = findViewById(R.id.search_server_input_field );
-        searchTextView.setOnEditorActionListener( onSearchTextValidated );
-
-        emptyView = findViewById(R.id.empty_server_selection_view);
-
-        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(SearchServerActivity.this);
-        recyclerView.setLayoutManager(layoutManager);
-
-        serverAdapter = new ServerSearchAdapter(new ArrayList<>(), this);
-        recyclerView.setAdapter(serverAdapter);
-
-        loadServers(currentStart, count, searchTextView.getText().toString() );
-
-        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-            }
-
-            @Override
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-
-                if (dy > 0) {
-                    // is at end of list?
-                    if (!recyclerView.canScrollVertically(RecyclerView.FOCUS_DOWN)) {
-                        if (!isLoading) {
-                            currentStart = currentStart + count;
-                            loadServers(currentStart, count, searchTextView.getText().toString());
-                        }
-                    }
-                }
-
-            }
-        });
-
-        swipeRefreshLayout.setOnRefreshListener(() -> {
-            // Refresh items
-            if (!isLoading) {
-                currentStart = 0;
-                loadServers(currentStart, count, searchTextView.getText().toString());
-            }
-        });
-
-
-    }
-
-    private void loadServers(int start, int count, String searchtext) {
-        isLoading = true;
-
-        GetServerListDataService service = RetrofitInstance.getRetrofitInstance(
-                APIUrlHelper.getServerIndexUrl(SearchServerActivity.this)
-                , APIUrlHelper.useInsecureConnection(this)).create(GetServerListDataService.class);
-
-        if ( !searchtext.equals( lastSearchtext ) )
-        {
-            currentStart = 0;
-            lastSearchtext = searchtext;
-        }
-
-        Call<ServerList> call;
-
-        call = service.getInstancesData(start, count, searchtext);
-
-        Log.d("URL Called", call.request().url() + "");
-
-        call.enqueue(new Callback<ServerList>() {
-            @Override
-            public void onResponse(@NonNull Call<ServerList> call, @NonNull Response<ServerList> response) {
-
-                if (currentStart == 0) {
-                    serverAdapter.clearData();
-                }
-
-                if (response.body() != null) {
-                    serverAdapter.setData(response.body().getServerArrayList());
-                }
-
-                // no results show no results message
-                if (currentStart == 0 && serverAdapter.getItemCount() == 0) {
-                    emptyView.setVisibility(View.VISIBLE);
-                    recyclerView.setVisibility(View.GONE);
-
-                } else {
-                    emptyView.setVisibility(View.GONE);
-                    recyclerView.setVisibility(View.VISIBLE);
-                }
-
-                isLoading = false;
-                swipeRefreshLayout.setRefreshing(false);
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<ServerList> call, @NonNull Throwable t) {
-                Log.wtf("err", t.fillInStackTrace());
-                ErrorHelper.showToastFromCommunicationError( SearchServerActivity.this, t );
-                isLoading = false;
-                swipeRefreshLayout.setRefreshing(false);
-            }
-        });
-
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.kt b/app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.kt
deleted file mode 100644
index 59d3560..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.kt
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.activity
-
-import android.app.Activity
-import android.app.AlertDialog
-import android.content.DialogInterface
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.fragment.app.FragmentManager
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import net.schueller.peertube.R
-import net.schueller.peertube.adapter.ServerListAdapter
-import net.schueller.peertube.database.Server
-import net.schueller.peertube.database.ServerViewModel
-import net.schueller.peertube.databinding.ActivityServerAddressBookBinding
-import net.schueller.peertube.fragment.AddServerFragment
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.network.Session
-import net.schueller.peertube.service.LoginService
-import java.util.*
-
-class ServerAddressBookActivity : CommonActivity() {
-
-    private val TAG = "ServerAddBookAct"
-
-    private val mServerViewModel: ServerViewModel by viewModels()
-    private var addServerFragment: AddServerFragment? = null
-
-    private val fragmentManager: FragmentManager by lazy { supportFragmentManager }
-
-
-    private lateinit var mBinding: ActivityServerAddressBookBinding
-
-
-    override fun onSupportNavigateUp(): Boolean {
-        finish() // close this activity as oppose to navigating up
-        return false
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        mBinding = ActivityServerAddressBookBinding.inflate(layoutInflater)
-        setContentView(mBinding.root)
-
-        // Setting toolbar as the ActionBar with setSupportActionBar() call
-        setSupportActionBar(mBinding.toolBarServerAddressBook)
-        supportActionBar?.apply {
-            setDisplayHomeAsUpEnabled(true)
-            setHomeAsUpIndicator(R.drawable.ic_baseline_close_24)
-        }
-
-
-        showServers()
-
-        mBinding.addServer.setOnClickListener {
-            Log.d(TAG, "Click")
-
-            val fragmentTransaction = fragmentManager.beginTransaction()
-            addServerFragment = AddServerFragment().also {
-                fragmentTransaction.replace(R.id.server_book, it)
-                fragmentTransaction.commit()
-                mBinding.addServer.hide()
-            }
-        }
-    }
-
-    private fun onServerClick(server: Server) {
-
-        val sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
-        val editor = sharedPref.edit()
-        val serverUrl = APIUrlHelper.cleanServerUrl(server.serverHost)
-        editor.putString(getString(R.string.pref_api_base_key), serverUrl)
-        editor.apply()
-
-        // Logout if logged in
-        val session = Session.getInstance()
-        if (session.isLoggedIn) {
-            session.invalidate()
-        }
-
-        // attempt authentication if we have a username
-        if (server.username.isNullOrBlank().not()) {
-            LoginService.Authenticate(server.username, server.password)
-        }
-
-        // close this activity
-        finish()
-        Toast.makeText(this, getString(R.string.server_selection_set_server, serverUrl), Toast.LENGTH_LONG).show()
-    }
-
-    private fun onEditClick(server: Server) {
-        val fragmentTransaction = fragmentManager.beginTransaction()
-        addServerFragment = AddServerFragment.newInstance(server).also {
-            fragmentTransaction.replace(R.id.server_book, it)
-            fragmentTransaction.commit()
-            mBinding.addServer.hide()
-        }
-    }
-
-    private fun showServers() {
-        val adapter = ServerListAdapter(mutableListOf(), { onServerClick(it) }, { onEditClick(it) }).also {
-            mBinding.serverListRecyclerview.adapter = it
-        }
-
-        // Delete items on swipe
-        val helper = ItemTouchHelper(
-                object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
-                    override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-                        return false
-                    }
-
-                    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-                        AlertDialog.Builder(this@ServerAddressBookActivity)
-                                .setTitle(getString(R.string.server_book_del_alert_title))
-                                .setMessage(getString(R.string.server_book_del_alert_msg))
-                                .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                                    val position = viewHolder.bindingAdapterPosition
-                                    val server = adapter.getServerAtPosition(position)
-//                                    Toast.makeText(ServerAddressBookActivity.this, "Deleting " +
-//                                            server.getServerName(), Toast.LENGTH_LONG).show();
-                                    // Delete the server
-                                    mServerViewModel.delete(server)
-                                }
-                                .setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int -> adapter.notifyItemChanged(viewHolder.bindingAdapterPosition) }
-                                .setIcon(android.R.drawable.ic_dialog_alert)
-                                .show()
-                    }
-                })
-        helper.attachToRecyclerView(mBinding.serverListRecyclerview)
-
-
-        // Update the cached copy of the words in the adapter.
-        mServerViewModel.allServers.observe(this, { servers: List<Server> ->
-            adapter.setServers(servers)
-
-            addServerFragment?.let {
-                val fragmentTransaction = fragmentManager.beginTransaction()
-                fragmentTransaction.remove(it)
-                fragmentTransaction.commit()
-                mBinding.addServer.show()
-            }
-        })
-    }
-
-    companion object {
-        const val EXTRA_REPLY = "net.schueller.peertube.room.REPLY"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
deleted file mode 100644
index fdc65e5..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.activity;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-
-import android.provider.SearchRecentSuggestions;
-import android.util.Log;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog.Builder;
-import androidx.appcompat.widget.Toolbar;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-
-import androidx.preference.SwitchPreference;
-import net.schueller.peertube.BuildConfig;
-import net.schueller.peertube.R;
-import net.schueller.peertube.provider.SearchSuggestionsProvider;
-
-public class SettingsActivity extends CommonActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_settings);
-        getSupportFragmentManager()
-                .beginTransaction()
-                .replace(R.id.settings, new SettingsFragment())
-                .commit();
-
-        // Attaching the layout to the toolbar object
-        Toolbar toolbar = findViewById(R.id.tool_bar_settings);
-        // Setting toolbar as the ActionBar with setSupportActionBar() call
-        setSupportActionBar(toolbar);
-
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
-        }
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish(); // close this activity as oppose to navigating up
-        return false;
-    }
-
-    public static class SettingsFragment extends PreferenceFragmentCompat {
-        @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            setPreferencesFromResource(R.xml.root_preferences, rootKey);
-
-            // write Build Time into pref
-            Preference pref = findPreference("pref_buildtime");
-            assert pref != null;
-            pref.setSummary(Long.toString(BuildConfig.BUILD_TIME));
-
-            // double check disabling SSL
-            final SwitchPreference insecure = (SwitchPreference) findPreference("pref_accept_insecure");
-            if (insecure != null) {
-                insecure.setOnPreferenceChangeListener((preference, newValue) -> {
-
-                    SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
-                    SharedPreferences.Editor editor = sharedPref.edit();
-
-                    boolean currentValue = sharedPref.getBoolean("pref_accept_insecure", false);
-
-                    if (newValue instanceof Boolean && ((Boolean) newValue) != currentValue) {
-                        final boolean enable = (Boolean) newValue;
-
-                        Log.v("pref", "enable: " + enable);
-                        Log.v("pref", "currentValue: " + currentValue);
-
-                        if (enable) {
-                            new Builder(preference.getContext())
-                                    .setTitle(R.string.pref_insecure_confirm_title)
-                                    .setMessage(R.string.pref_insecure_confirm_message)
-                                    .setIcon(R.drawable.ic_info_black_24dp)
-                                    .setNegativeButton(R.string.pref_insecure_confirm_no, (dialog, whichButton) -> {
-                                        // do nothing
-                                    })
-                                    .setPositiveButton(R.string.pref_insecure_confirm_yes, (dialog, whichButton) -> {
-                                        // OK has been pressed => force the new value and update the checkbox display
-                                        editor.putBoolean("pref_accept_insecure", true);
-                                        editor.apply();
-                                        insecure.setChecked(true);
-                                    }).create().show();
-                            // by default ignore the pref change, which can only be validated when OK is pressed
-                            return false;
-                        }
-                    }
-                    return true;
-                });
-            }
-            //clear search history buttonish
-            Preference button = findPreference(getString(R.string.pref_clear_history_key));
-            button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    new Builder(preference.getContext())
-                            .setTitle(R.string.clear_search_history)
-                            .setMessage(R.string.clear_search_history_prompt)
-                            .setIcon(R.drawable.ic_info_black_24dp)
-                            .setNegativeButton(R.string.pref_insecure_confirm_no, (dialog, whichButton) -> {
-                                // do nothing
-                            })
-                            .setPositiveButton(R.string.pref_insecure_confirm_yes, (dialog, whichButton) -> {
-                                // OK has been pressed
-                                SearchRecentSuggestions suggestions = new SearchRecentSuggestions(getContext(),
-                                        SearchSuggestionsProvider.AUTHORITY,
-                                        SearchSuggestionsProvider.MODE);
-                                suggestions.clearHistory();
-                            }).create().show();
-                    return true;
-                }
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.kt b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.kt
deleted file mode 100644
index 8a8304f..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.kt
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.activity
-
-import android.Manifest.permission
-import android.R.drawable
-import android.R.string
-import android.app.Activity
-import android.app.AlertDialog.Builder
-import android.app.SearchManager
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.database.Cursor
-import android.os.Bundle
-import android.provider.SearchRecentSuggestions
-import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import android.view.MenuItem.OnActionExpandListener
-import android.view.View
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.widget.SearchView
-import androidx.appcompat.widget.SearchView.OnSuggestionListener
-import androidx.appcompat.widget.Toolbar
-import androidx.core.app.ActivityCompat
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.LayoutManager
-import androidx.recyclerview.widget.RecyclerView.OnScrollListener
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.google.android.material.navigation.NavigationBarView
-import net.schueller.peertube.R
-import net.schueller.peertube.R.id
-import net.schueller.peertube.R.layout
-import net.schueller.peertube.adapter.MultiViewRecycleViewAdapter
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.helper.ErrorHelper
-import net.schueller.peertube.model.Overview
-import net.schueller.peertube.model.VideoList
-import net.schueller.peertube.network.GetUserService
-import net.schueller.peertube.network.GetVideoDataService
-import net.schueller.peertube.network.RetrofitInstance
-import net.schueller.peertube.network.Session
-import net.schueller.peertube.provider.SearchSuggestionsProvider
-import net.schueller.peertube.service.VideoPlayerService
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-private const val TAG = "_VideoListActivity"
-
-class VideoListActivity : CommonActivity() {
-
-    private var mMultiViewAdapter: MultiViewRecycleViewAdapter? = null
-    private var swipeRefreshLayout: SwipeRefreshLayout? = null
-    private var currentStart = 0
-    private var currentPage = 1
-    private val count = 12
-    private var sort = "-createdAt"
-    private var filter: String? = null
-    private var searchQuery = ""
-    private var subscriptions = false
-    private var emptyView: TextView? = null
-    private var recyclerView: RecyclerView? = null
-    private var isLoading = false
-    private var overViewActive = false
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(layout.activity_video_list)
-        filter = null
-        createBottomBarNavigation()
-
-        // Attaching the layout to the toolbar object
-        val toolbar = findViewById<Toolbar>(id.tool_bar)
-        // Setting toolbar as the ActionBar with setSupportActionBar() call
-        setSupportActionBar(toolbar)
-
-        // load Video List
-        createList()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        val inflater = menuInflater
-        inflater.inflate(R.menu.menu_top_videolist, menu)
-
-        // Set an icon in the ActionBar
-        menu.findItem(id.action_account).setIcon(R.drawable.ic_user)
-        menu.findItem(id.action_server_address_book).setIcon(R.drawable.ic_server)
-        val searchMenuItem = menu.findItem(id.action_search)
-        searchMenuItem.setIcon(R.drawable.ic_search)
-
-        // Get the SearchView and set the searchable configuration
-        val searchManager = getSystemService(SEARCH_SERVICE) as SearchManager
-        val searchView = searchMenuItem.actionView as SearchView
-
-        // Assumes current activity is the searchable activity
-        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName))
-        searchView.setIconifiedByDefault(false) // Do not iconify the widget; expand it by default
-        searchView.isQueryRefinementEnabled = true
-        searchMenuItem.actionView.setOnLongClickListener {
-            Builder(this@VideoListActivity)
-                .setTitle(getString(R.string.clear_search_history))
-                .setMessage(getString(R.string.clear_search_history_prompt))
-                .setPositiveButton(string.ok) { _, _ ->
-                    val suggestions = SearchRecentSuggestions(
-                        applicationContext,
-                        SearchSuggestionsProvider.AUTHORITY,
-                        SearchSuggestionsProvider.MODE
-                    )
-                    suggestions.clearHistory()
-                }
-                .setNegativeButton(string.cancel, null)
-                .setIcon(drawable.ic_dialog_alert)
-                .show()
-            true
-        }
-        searchMenuItem.setOnActionExpandListener(object : OnActionExpandListener {
-            override fun onMenuItemActionExpand(menuItem: MenuItem): Boolean {
-                return true
-            }
-
-            override fun onMenuItemActionCollapse(menuItem: MenuItem): Boolean {
-                searchQuery = ""
-                Log.d(TAG, "onMenuItemActionCollapse: ")
-                loadVideos(0, count, sort, filter)
-                return true
-            }
-        })
-
-        // TODO, this doesn't work
-        searchManager.setOnDismissListener {
-            searchQuery = ""
-            Log.d(TAG, "onDismiss: ")
-            loadVideos(0, count, sort, filter)
-        }
-        searchView.setOnSuggestionListener(object : OnSuggestionListener {
-            override fun onSuggestionClick(position: Int): Boolean {
-                val suggestion = getSuggestion(position)
-                searchView.setQuery(suggestion, true)
-                return true
-            }
-
-            private fun getSuggestion(position: Int): String {
-                val cursor = searchView.suggestionsAdapter.getItem(
-                    position
-                ) as Cursor
-                return cursor.getString(
-                    cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_TEXT_1)
-                )
-            }
-
-            override fun onSuggestionSelect(position: Int): Boolean {
-                /* Required to implement */
-                return true
-            }
-        })
-        return true
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        stopService(Intent(this, VideoPlayerService::class.java))
-    }
-
-//    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-//        super.onActivityResult(requestCode, resultCode, data)
-//        if (requestCode == SWITCH_INSTANCE) {
-//            if (resultCode == RESULT_OK) {
-//                loadVideos(currentStart, count, sort, filter)
-//            }
-//        }
-//    }
-
-    private var resultLauncher = registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
-            loadVideos(currentStart, count, sort, filter)
-        }
-    }
-
-    private fun openActivityForResult(intent: Intent) {
-        resultLauncher.launch(intent)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        when (item.itemId) {
-            id.action_search ->                 //Toast.makeText(this, "Search Selected", Toast.LENGTH_SHORT).show();
-                return false
-            id.action_account -> {
-                //                if (!Session.getInstance().isLoggedIn()) {
-
-                //Intent intentLogin = new Intent(this, ServerAddressBookActivity.class);
-                val intentMe = Intent(this, MeActivity::class.java)
-                this.startActivity(intentMe)
-
-                //overridePendingTransition(R.anim.slide_in_bottom, 0);
-
-                //  this.startActivity(intentLogin);
-
-//                } else {
-//                    Intent intentMe = new Intent(this, MeActivity.class);
-//                    this.startActivity(intentMe);
-//                }
-                return false
-            }
-            id.action_server_address_book -> {
-                val addressBookActivityIntent = Intent(this, ServerAddressBookActivity::class.java)
-                openActivityForResult(addressBookActivityIntent)
-                return false
-            }
-            else -> {
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun createList() {
-        recyclerView = findViewById(id.recyclerView)
-        swipeRefreshLayout = findViewById(id.swipeRefreshLayout)
-        emptyView = findViewById(id.empty_view)
-        val layoutManager: LayoutManager = LinearLayoutManager(this@VideoListActivity)
-        recyclerView?.layoutManager = layoutManager
-
-        mMultiViewAdapter = MultiViewRecycleViewAdapter()
-        recyclerView?.adapter = mMultiViewAdapter
-
-//        loadVideos(currentStart, count, sort, filter)
-        overViewActive = true
-        loadOverview(currentPage)
-
-        recyclerView?.addOnScrollListener(object : OnScrollListener() {
-
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                if (dy > 0) {
-                    // is at end of list?
-                    if (!recyclerView.canScrollVertically(RecyclerView.FOCUS_DOWN)) {
-                        if (!isLoading) {
-                            if (overViewActive) {
-                                currentPage++
-                                loadOverview(currentPage)
-                            } else {
-                                currentStart += count
-                                loadVideos(currentStart, count, sort, filter)
-                            }
-                        }
-                    }
-                }
-            }
-        })
-        swipeRefreshLayout?.setOnRefreshListener {
-            // Refresh items
-            if (!isLoading) {
-                if (overViewActive) {
-                    currentPage = 1
-                    loadOverview(currentPage)
-                } else {
-                    currentStart = 0
-                    loadVideos(currentStart, count, sort, filter)
-                }
-            }
-        }
-    }
-
-    private fun loadOverview(page: Int) {
-        isLoading = true
-
-        // We set this to default to null so that on initial start there are videos listed.
-        val apiBaseURL = APIUrlHelper.getUrlWithVersion(this)
-        val service =
-            RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(
-                GetVideoDataService::class.java
-            )
-        val call: Call<Overview>? = service.getOverviewVideosData(page)
-
-        call?.enqueue(object : Callback<Overview?> {
-            override fun onResponse(call: Call<Overview?>, response: Response<Overview?>) {
-                if (page == 1) {
-                    mMultiViewAdapter?.clearData()
-                }
-                if (response.body() != null) {
-                    val overview = response.body()
-                    if (overview != null) {
-                        if (overview.categories.isNotEmpty()) {
-                            mMultiViewAdapter?.setCategoryTitle(overview.categories[0].category)
-                            mMultiViewAdapter?.setVideoData(overview.categories[0].videos)
-                        }
-                        if (overview.channels.isNotEmpty()) {
-                            mMultiViewAdapter?.setChannelTitle(overview.channels[0].channel)
-                            mMultiViewAdapter?.setVideoData(overview.channels[0].videos)
-                        }
-                        if (overview.tags.isNotEmpty()) {
-                            mMultiViewAdapter?.setTagTitle(overview.tags[0])
-                            mMultiViewAdapter?.setVideoData(overview.tags[0].videos)
-                        }
-
-                    }
-                }
-
-                // no results show no results message
-                if (mMultiViewAdapter?.itemCount == 0) {
-                    emptyView!!.visibility = View.VISIBLE
-                    recyclerView!!.visibility = View.GONE
-                } else {
-                    emptyView!!.visibility = View.GONE
-                    recyclerView!!.visibility = View.VISIBLE
-                }
-                isLoading = false
-                swipeRefreshLayout!!.isRefreshing = false
-            }
-
-            override fun onFailure(call: Call<Overview?>, t: Throwable) {
-                Log.wtf("err", t.fillInStackTrace())
-                ErrorHelper.showToastFromCommunicationError(this@VideoListActivity, t)
-                isLoading = false
-                swipeRefreshLayout!!.isRefreshing = false
-            }
-        })
-
-
-    }
-
-    private fun loadVideos(start: Int, count: Int, sort: String, filter: String?) {
-        isLoading = true
-
-        val sharedPref = getSharedPreferences(packageName + "_preferences", Context.MODE_PRIVATE)
-        val nsfw = if (sharedPref.getBoolean(getString(R.string.pref_show_nsfw_key), false)) "both" else "false"
-
-//
-//        Locale locale = getResources().getConfiguration().locale;
-//        String country = locale.getLanguage();
-//
-//        HashSet<String> countries = new HashSet<>(1);
-//        countries.add(country);
-
-        // We set this to default to null so that on initial start there are videos listed.
-        val languages = sharedPref.getStringSet(getString(R.string.pref_video_language_key), null)
-        val apiBaseURL = APIUrlHelper.getUrlWithVersion(this)
-        val service =
-            RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(
-                GetVideoDataService::class.java
-            )
-        val call: Call<VideoList> = when {
-            searchQuery != "" -> {
-                service.searchVideosData(start, count, sort, nsfw, searchQuery, filter, languages)
-            }
-            subscriptions -> {
-                val userService =
-                    RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(
-                        GetUserService::class.java
-                    )
-                userService.getVideosSubscripions(start, count, sort)
-            }
-            else -> {
-                service.getVideosData(start, count, sort, nsfw, filter, languages)
-            }
-        }
-
-        /*Log the URL called*/Log.d("URL Called", call.request().url.toString() + "")
-        //        Toast.makeText(VideoListActivity.this, "URL Called: " + call.request().url(), Toast.LENGTH_SHORT).show();
-        call.enqueue(object : Callback<VideoList?> {
-            override fun onResponse(call: Call<VideoList?>, response: Response<VideoList?>) {
-                if (currentStart == 0) {
-                    mMultiViewAdapter!!.clearData()
-                }
-                if (response.body() != null) {
-                    val videoList = response.body()
-                    if (videoList != null) {
-                        mMultiViewAdapter!!.setVideoListData(videoList)
-                    }
-                }
-
-                // no results show no results message
-                if (currentStart == 0 && mMultiViewAdapter!!.itemCount == 0) {
-                    emptyView!!.visibility = View.VISIBLE
-                    recyclerView!!.visibility = View.GONE
-                } else {
-                    emptyView!!.visibility = View.GONE
-                    recyclerView!!.visibility = View.VISIBLE
-                }
-                isLoading = false
-                swipeRefreshLayout!!.isRefreshing = false
-            }
-
-            override fun onFailure(call: Call<VideoList?>, t: Throwable) {
-                Log.wtf("err", t.fillInStackTrace())
-                ErrorHelper.showToastFromCommunicationError(this@VideoListActivity, t)
-                isLoading = false
-                swipeRefreshLayout!!.isRefreshing = false
-            }
-        })
-    }
-
-    override fun onResume() {
-        super.onResume()
-        // only check when we actually need the permission
-        val sharedPref = getSharedPreferences(packageName + "_preferences", Context.MODE_PRIVATE)
-        if (ActivityCompat.checkSelfPermission(
-                this,
-                permission.WRITE_EXTERNAL_STORAGE
-            ) != PackageManager.PERMISSION_GRANTED &&
-            sharedPref.getBoolean(getString(R.string.pref_torrent_player_key), false)
-        ) {
-            ActivityCompat.requestPermissions(this, arrayOf(permission.WRITE_EXTERNAL_STORAGE), 0)
-        }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        handleIntent(intent)
-    }
-
-    private fun handleIntent(intent: Intent) {
-        if (Intent.ACTION_SEARCH == intent.action) {
-            val query = intent.getStringExtra(SearchManager.QUERY)
-            val suggestions = SearchRecentSuggestions(
-                this,
-                SearchSuggestionsProvider.AUTHORITY,
-                SearchSuggestionsProvider.MODE
-            )
-
-            // Save recent searches
-            suggestions.saveRecentQuery(query, null)
-            if (query != null) {
-                searchQuery = query
-            }
-            loadVideos(0, count, sort, filter)
-        }
-    }
-
-    override fun onSearchRequested(): Boolean {
-        val appData = Bundle()
-        startSearch(null, false, appData, false)
-        return true
-    }
-
-    private fun createBottomBarNavigation() {
-
-        // Get Bottom Navigation
-        val navigation = findViewById<BottomNavigationView>(id.navigation)
-
-        // Always show text label
-        navigation.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_LABELED
-
-        // Add Icon font
-        val navMenu = navigation.menu
-        navMenu.findItem(id.navigation_overview).setIcon(R.drawable.ic_globe)
-        navMenu.findItem(id.navigation_trending).setIcon(R.drawable.ic_trending)
-        navMenu.findItem(id.navigation_recent).setIcon(R.drawable.ic_plus_circle)
-        navMenu.findItem(id.navigation_local).setIcon(R.drawable.ic_local)
-        navMenu.findItem(id.navigation_subscriptions).setIcon(R.drawable.ic_subscriptions)
-        //        navMenu.findItem(R.id.navigation_account).setIcon(
-//                new IconicsDrawable(this, FontAwesome.Icon.faw_user_circle));
-
-        // Click Listener
-        navigation.setOnItemSelectedListener { menuItem: MenuItem ->
-            when (menuItem.itemId) {
-                id.navigation_overview -> {
-                    // TODO
-                    if (!isLoading) {
-                        currentPage = 1
-                        loadOverview(currentPage)
-                        overViewActive = true
-                    }
-                    return@setOnItemSelectedListener true
-                }
-                id.navigation_trending -> {
-                    //Log.v(TAG, "navigation_trending");
-                    if (!isLoading) {
-                        overViewActive = false
-                        sort = "-trending"
-                        currentStart = 0
-                        filter = null
-                        subscriptions = false
-                        loadVideos(currentStart, count, sort, filter)
-                    }
-                    return@setOnItemSelectedListener true
-                }
-                id.navigation_recent -> {
-                    if (!isLoading) {
-                        overViewActive = false
-                        sort = "-createdAt"
-                        currentStart = 0
-                        filter = null
-                        subscriptions = false
-                        loadVideos(currentStart, count, sort, filter)
-                    }
-                    return@setOnItemSelectedListener true
-                }
-                id.navigation_local -> {
-                    //Log.v(TAG, "navigation_trending");
-                    if (!isLoading) {
-                        overViewActive = false
-                        sort = "-publishedAt"
-                        filter = "local"
-                        currentStart = 0
-                        subscriptions = false
-                        loadVideos(currentStart, count, sort, filter)
-                    }
-                    return@setOnItemSelectedListener true
-                }
-                id.navigation_subscriptions ->                     //Log.v(TAG, "navigation_subscriptions");
-                    if (!Session.getInstance().isLoggedIn) {
-//                        Intent intent = new Intent(this, LoginActivity.class);
-//                        this.startActivity(intent);
-                        val addressBookActivityIntent = Intent(this, ServerAddressBookActivity::class.java)
-                        openActivityForResult(addressBookActivityIntent)
-                        return@setOnItemSelectedListener false
-                    } else {
-                        if (!isLoading) {
-                            overViewActive = false
-                            sort = "-publishedAt"
-                            filter = null
-                            currentStart = 0
-                            subscriptions = true
-                            loadVideos(currentStart, count, sort, filter)
-                        }
-                        return@setOnItemSelectedListener true
-                    }
-            }
-            false
-        }
-
-        // TODO: on double click jump to top and reload
-//        navigation.setOnNavigationItemReselectedListener(menuItemReselected -> {
-//            switch (menuItemReselected.getItemId()) {
-//                case R.id.navigation_home:
-//                    if (!isLoading) {
-//                        sort = "-createdAt";
-//                        currentStart = 0;
-//                        filter = null;
-//                        subscriptions = false;
-//                        loadVideos(currentStart, count, sort, filter);
-//                    }
-//                case R.id.navigation_trending:
-//                    if (!isLoading) {
-//                        sort = "-trending";
-//                        currentStart = 0;
-//                        filter = null;
-//                        subscriptions = false;
-//                        loadVideos(currentStart, count, sort, filter);
-//                    }
-//                case R.id.navigation_local:
-//                    if (!isLoading) {
-//                        sort = "-publishedAt";
-//                        filter = "local";
-//                        currentStart = 0;
-//                        subscriptions = false;
-//                        loadVideos(currentStart, count, sort, filter);
-//                    }
-//                case R.id.navigation_subscriptions:
-//                    if (Session.getInstance().isLoggedIn()) {
-//                        if (!isLoading) {
-//                            sort = "-publishedAt";
-//                            filter = null;
-//                            currentStart = 0;
-//                            subscriptions = true;
-//                            loadVideos(currentStart, count, sort, filter);
-//                        }
-//                    }
-//            }
-//        });
-    }
-
-    companion object {
-
-        const val EXTRA_VIDEOID = "VIDEOID"
-        const val EXTRA_ACCOUNTDISPLAYNAME = "ACCOUNTDISPLAYNAMEANDHOST"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.kt b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.kt
deleted file mode 100644
index bdb4ae0..0000000
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.kt
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.activity
-
-import androidx.appcompat.app.AppCompatActivity
-import android.annotation.SuppressLint
-import net.schueller.peertube.fragment.VideoPlayerFragment
-import net.schueller.peertube.R
-import android.app.RemoteAction
-import android.app.PendingIntent
-import com.google.android.exoplayer2.ui.PlayerNotificationManager
-import android.app.PictureInPictureParams
-import android.content.*
-import android.content.res.Configuration
-import android.graphics.drawable.Icon
-import android.os.Bundle
-import android.text.TextUtils
-import net.schueller.peertube.fragment.VideoMetaDataFragment
-import android.widget.RelativeLayout
-import android.widget.FrameLayout
-import android.util.TypedValue
-import android.view.WindowManager
-import net.schueller.peertube.service.VideoPlayerService
-import net.schueller.peertube.helper.VideoHelper
-import androidx.annotation.RequiresApi
-import android.os.Build
-import android.util.Log
-import android.util.Rational
-import androidx.fragment.app.Fragment
-import net.schueller.peertube.fragment.VideoDescriptionFragment
-import java.util.ArrayList
-
-class VideoPlayActivity : CommonActivity() {
-    private var receiver: BroadcastReceiver? = null
-
-    //This can only be called when in entering pip mode which can't happen if the device doesn't support pip mode.
-    @SuppressLint("NewApi")
-    fun makePipControls() {
-        val fragmentManager = supportFragmentManager
-        val videoPlayerFragment =
-            fragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?
-        val actions = ArrayList<RemoteAction>()
-        var actionIntent = Intent(getString(R.string.app_background_audio))
-        var pendingIntent =
-            PendingIntent.getBroadcast(applicationContext, REQUEST_CODE, actionIntent, 0)
-        @SuppressLint("NewApi", "LocalSuppress") var icon = Icon.createWithResource(
-            applicationContext, android.R.drawable.stat_sys_speakerphone
-        )
-        @SuppressLint("NewApi", "LocalSuppress") var remoteAction =
-            RemoteAction(icon!!, "close pip", "from pip window custom command", pendingIntent!!)
-        actions.add(remoteAction)
-        actionIntent = Intent(PlayerNotificationManager.ACTION_STOP)
-        pendingIntent =
-            PendingIntent.getBroadcast(applicationContext, REQUEST_CODE, actionIntent, 0)
-        icon = Icon.createWithResource(
-            applicationContext,
-            com.google.android.exoplayer2.ui.R.drawable.exo_notification_stop
-        )
-        remoteAction = RemoteAction(icon, "play", "stop the media", pendingIntent)
-        actions.add(remoteAction)
-        assert(videoPlayerFragment != null)
-        if (videoPlayerFragment!!.isPaused) {
-            Log.e(TAG, "setting actions with play button")
-            actionIntent = Intent(PlayerNotificationManager.ACTION_PLAY)
-            pendingIntent =
-                PendingIntent.getBroadcast(applicationContext, REQUEST_CODE, actionIntent, 0)
-            icon = Icon.createWithResource(
-                applicationContext,
-                com.google.android.exoplayer2.ui.R.drawable.exo_notification_play
-            )
-            remoteAction = RemoteAction(icon, "play", "play the media", pendingIntent)
-        } else {
-            Log.e(TAG, "setting actions with pause button")
-            actionIntent = Intent(PlayerNotificationManager.ACTION_PAUSE)
-            pendingIntent =
-                PendingIntent.getBroadcast(applicationContext, REQUEST_CODE, actionIntent, 0)
-            icon = Icon.createWithResource(
-                applicationContext,
-                com.google.android.exoplayer2.ui.R.drawable.exo_notification_pause
-            )
-            remoteAction = RemoteAction(icon, "pause", "pause the media", pendingIntent)
-        }
-        actions.add(remoteAction)
-
-
-        //add custom actions to pip window
-        val params = PictureInPictureParams.Builder()
-            .setActions(actions)
-            .build()
-        setPictureInPictureParams(params)
-    }
-
-    private fun changedToPipMode() {
-        val fragmentManager = supportFragmentManager
-        val videoPlayerFragment =
-            (fragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?)!!
-        videoPlayerFragment.showControls(false)
-        //create custom actions
-        makePipControls()
-
-        //setup receiver to handle customer actions
-        val filter = IntentFilter()
-        filter.addAction(PlayerNotificationManager.ACTION_STOP)
-        filter.addAction(PlayerNotificationManager.ACTION_PAUSE)
-        filter.addAction(PlayerNotificationManager.ACTION_PLAY)
-        filter.addAction(getString(R.string.app_background_audio))
-        receiver = object : BroadcastReceiver() {
-            override fun onReceive(context: Context, intent: Intent) {
-                val action = intent.action!!
-                if (action == PlayerNotificationManager.ACTION_PAUSE) {
-                    videoPlayerFragment.pauseVideo()
-                    makePipControls()
-                }
-                if (action == PlayerNotificationManager.ACTION_PLAY) {
-                    videoPlayerFragment.unPauseVideo()
-                    makePipControls()
-                }
-                if (action == getString(R.string.app_background_audio)) {
-                    unregisterReceiver(receiver)
-                    finish()
-                }
-                if (action == PlayerNotificationManager.ACTION_STOP) {
-                    unregisterReceiver(receiver)
-                    finishAndRemoveTask()
-                }
-            }
-        }
-        registerReceiver(receiver, filter)
-        Log.v(TAG, "switched to pip ")
-        floatMode = true
-        videoPlayerFragment.showControls(false)
-    }
-
-    private fun changedToNormalMode() {
-        val fragmentManager = supportFragmentManager
-        val videoPlayerFragment =
-            (fragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?)!!
-        videoPlayerFragment.showControls(true)
-        if (receiver != null) {
-            unregisterReceiver(receiver)
-        }
-        Log.v(TAG, "switched to normal")
-        floatMode = false
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        // Set theme
-        val sharedPref = getSharedPreferences(packageName + "_preferences", Context.MODE_PRIVATE)
-        setTheme(
-            resources.getIdentifier(
-                sharedPref.getString(
-                    getString(R.string.pref_theme_key),
-                    getString(R.string.app_default_theme)
-                ),
-                "style",
-                packageName
-            )
-        )
-        setContentView(R.layout.activity_video_play)
-
-        // get video ID
-        val intent = intent
-        val videoUuid = intent.getStringExtra(VideoListActivity.EXTRA_VIDEOID)
-        val videoPlayerFragment =
-            (supportFragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?)!!
-        val playingVideo = videoPlayerFragment.videoUuid
-        Log.v(TAG, "oncreate click: $videoUuid is trying to replace: $playingVideo")
-        when {
-            TextUtils.isEmpty(playingVideo) -> {
-                Log.v(TAG, "oncreate no video currently playing")
-                videoPlayerFragment.start(videoUuid)
-            }
-            playingVideo != videoUuid -> {
-                Log.v(TAG, "oncreate different video playing currently")
-                videoPlayerFragment.stopVideo()
-                videoPlayerFragment.start(videoUuid)
-            }
-            else -> {
-                Log.v(TAG, "oncreate same video playing currently")
-            }
-        }
-
-        // if we are in landscape set the video to fullscreen
-        val orientation = this.resources.configuration.orientation
-        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            setOrientation(true)
-        }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        val videoPlayerFragment =
-            (supportFragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?)!!
-        val videoUuid = intent.getStringExtra(VideoListActivity.EXTRA_VIDEOID)
-        Log.v(
-            TAG,
-            "new intent click: " + videoUuid + " is trying to replace: " + videoPlayerFragment.videoUuid
-        )
-        val playingVideo = videoPlayerFragment.videoUuid
-        when {
-            TextUtils.isEmpty(playingVideo) -> {
-                Log.v(TAG, "new intent no video currently playing")
-                videoPlayerFragment.start(videoUuid)
-            }
-            playingVideo != videoUuid -> {
-                Log.v(TAG, "new intent different video playing currently")
-                videoPlayerFragment.stopVideo()
-                videoPlayerFragment.start(videoUuid)
-            }
-            else -> {
-                Log.v(TAG, "new intent same video playing currently")
-            }
-        }
-
-        // if we are in landscape set the video to fullscreen
-        val orientation = this.resources.configuration.orientation
-        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            setOrientation(true)
-        }
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        Log.v(TAG, "onConfigurationChanged()...")
-        super.onConfigurationChanged(newConfig)
-
-        // Checking the orientation changes of the screen
-        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            setOrientation(true)
-        } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-            setOrientation(false)
-        }
-    }
-
-    private fun setOrientation(isLandscape: Boolean) {
-        val fragmentManager = supportFragmentManager
-        val videoPlayerFragment =
-            fragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?
-        val videoMetaFragment =
-            fragmentManager.findFragmentById(R.id.video_meta_data_fragment) as VideoMetaDataFragment?
-        assert(videoPlayerFragment != null)
-        val params = videoPlayerFragment!!.requireView().layoutParams as RelativeLayout.LayoutParams
-        params.width = FrameLayout.LayoutParams.MATCH_PARENT
-        params.height =
-            if (isLandscape) FrameLayout.LayoutParams.MATCH_PARENT else TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                250f,
-                resources.displayMetrics
-            )
-                .toInt()
-        videoPlayerFragment.requireView().layoutParams = params
-        if (videoMetaFragment != null) {
-            val transaction = fragmentManager.beginTransaction()
-                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out)
-            if (isLandscape) {
-                transaction.hide(videoMetaFragment)
-            } else {
-                transaction.show(videoMetaFragment)
-            }
-            transaction.commit()
-        }
-        videoPlayerFragment.setIsFullscreen(isLandscape)
-        if (isLandscape) {
-            window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        } else {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        }
-    }
-
-    override fun onDestroy() {
-        val videoPlayerFragment =
-            (supportFragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?)!!
-        videoPlayerFragment.destroyVideo()
-        super.onDestroy()
-        Log.v(TAG, "onDestroy...")
-    }
-
-    override fun onPause() {
-        super.onPause()
-        Log.v(TAG, "onPause()...")
-    }
-
-    override fun onResume() {
-        super.onResume()
-        Log.v(TAG, "onResume()...")
-    }
-
-    override fun onStop() {
-        super.onStop()
-        val videoPlayerFragment =
-            (supportFragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?)!!
-        videoPlayerFragment.stopVideo()
-
-        // TODO: doesn't remove fragment??
-        val fragment: Fragment?  = supportFragmentManager.findFragmentByTag(VideoDescriptionFragment.TAG)
-        if (fragment != null) {
-            Log.v(TAG, "remove VideoDescriptionFragment")
-            supportFragmentManager.beginTransaction().remove(fragment).commit()
-        }
-
-        Log.v(TAG, "onStop()...")
-    }
-
-    override fun onStart() {
-        super.onStart()
-        Log.v(TAG, "onStart()...")
-    }
-
-    @SuppressLint("NewApi")
-    public override fun onUserLeaveHint() {
-        Log.v(TAG, "onUserLeaveHint()...")
-        val sharedPref = getSharedPreferences(packageName + "_preferences", Context.MODE_PRIVATE)
-        val fragmentManager = supportFragmentManager
-        val videoPlayerFragment =
-            fragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?
-        val videoMetaDataFragment =
-            fragmentManager.findFragmentById(R.id.video_meta_data_fragment) as VideoMetaDataFragment?
-        val backgroundBehavior = sharedPref.getString(
-            getString(R.string.pref_background_behavior_key),
-            getString(R.string.pref_background_stop_key)
-        )
-        assert(videoPlayerFragment != null)
-        assert(backgroundBehavior != null)
-        if (videoMetaDataFragment!!.isLeaveAppExpected) {
-            super.onUserLeaveHint()
-            return
-        }
-        if (backgroundBehavior == getString(R.string.pref_background_stop_key)) {
-            Log.v(TAG, "stop the video")
-            videoPlayerFragment!!.pauseVideo()
-            stopService(Intent(this, VideoPlayerService::class.java))
-            super.onBackPressed()
-        } else if (backgroundBehavior == getString(R.string.pref_background_audio_key)) {
-            Log.v(TAG, "play the Audio")
-            super.onBackPressed()
-        } else if (backgroundBehavior == getString(R.string.pref_background_float_key)) {
-            Log.v(TAG, "play in floating video")
-            //canEnterPIPMode makes sure API level is high enough
-            if (VideoHelper.canEnterPipMode(this)) {
-                Log.v(TAG, "enabling pip")
-                enterPipMode()
-            } else {
-                Log.v(TAG, "unable to use pip")
-            }
-        } else {
-            // Deal with bad entries from older version
-            Log.v(TAG, "No setting, fallback")
-            super.onBackPressed()
-        }
-    }
-
-    // @RequiresApi(api = Build.VERSION_CODES.O)
-    @SuppressLint("NewApi")
-    override fun onBackPressed() {
-        Log.v(TAG, "onBackPressed()...")
-        val sharedPref = getSharedPreferences(packageName + "_preferences", Context.MODE_PRIVATE)
-        val videoPlayerFragment =
-            (supportFragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?)!!
-
-        // copying Youtube behavior to have back button exit full screen.
-        if (videoPlayerFragment.getIsFullscreen()) {
-            Log.v(TAG, "exiting full screen")
-            videoPlayerFragment.fullScreenToggle()
-            return
-        }
-        // pause video if pref is enabled
-        if (sharedPref.getBoolean(getString(R.string.pref_back_pause_key), true)) {
-            videoPlayerFragment.pauseVideo()
-        }
-        val backgroundBehavior = sharedPref.getString(
-            getString(R.string.pref_background_behavior_key),
-            getString(R.string.pref_background_stop_key)
-        )!!
-        if (backgroundBehavior == getString(R.string.pref_background_stop_key)) {
-            Log.v(TAG, "stop the video")
-            videoPlayerFragment.pauseVideo()
-            stopService(Intent(this, VideoPlayerService::class.java))
-            super.onBackPressed()
-        } else if (backgroundBehavior == getString(R.string.pref_background_audio_key)) {
-            Log.v(TAG, "play the Audio")
-            super.onBackPressed()
-        } else if (backgroundBehavior == getString(R.string.pref_background_float_key)) {
-            Log.v(TAG, "play in floating video")
-            //canEnterPIPMode makes sure API level is high enough
-            if (VideoHelper.canEnterPipMode(this)) {
-                Log.v(TAG, "enabling pip")
-                enterPipMode()
-                //fixes problem where back press doesn't bring up video list after returning from PIP mode
-                val intentSettings = Intent(this, VideoListActivity::class.java)
-                this.startActivity(intentSettings)
-            } else {
-                Log.v(TAG, "Unable to enter PIP mode")
-                super.onBackPressed()
-            }
-        } else {
-            // Deal with bad entries from older version
-            Log.v(TAG, "No setting, fallback")
-            super.onBackPressed()
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    fun enterPipMode() {
-        val fragmentManager = supportFragmentManager
-        val videoPlayerFragment =
-            fragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?
-        if (videoPlayerFragment!!.videoAspectRatio == 0.toFloat()) {
-            Log.i(TAG, "impossible to switch to pip")
-        } else {
-            val rational = Rational((videoPlayerFragment.videoAspectRatio * 100).toInt(), 100)
-            val mParams = PictureInPictureParams.Builder()
-                .setAspectRatio(rational) //                          .setSourceRectHint(new Rect(0,500,400,600))
-                .build()
-            enterPictureInPictureMode(mParams)
-        }
-    }
-
-    override fun onPictureInPictureModeChanged(
-        isInPictureInPictureMode: Boolean,
-        newConfig: Configuration
-    ) {
-        val fragmentManager = supportFragmentManager
-        val videoPlayerFragment =
-            fragmentManager.findFragmentById(R.id.video_player_fragment) as VideoPlayerFragment?
-        if (videoPlayerFragment != null) {
-            if (isInPictureInPictureMode) {
-                changedToPipMode()
-                Log.v(TAG, "switched to pip ")
-                videoPlayerFragment.useController(false)
-            } else {
-                changedToNormalMode()
-                Log.v(TAG, "switched to normal")
-                videoPlayerFragment.useController(true)
-            }
-        } else {
-            Log.e(TAG, "videoPlayerFragment is NULL")
-        }
-    }
-
-    companion object {
-        private const val TAG = "VideoPlayActivity"
-        var floatMode = false
-        private const val REQUEST_CODE = 101
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/adapter/ChannelAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/ChannelAdapter.java
deleted file mode 100644
index 60d9690..0000000
--- a/app/src/main/java/net/schueller/peertube/adapter/ChannelAdapter.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.adapter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.mikepenz.iconics.Iconics;
-import com.squareup.picasso.Picasso;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.activity.VideoPlayActivity;
-import net.schueller.peertube.helper.APIUrlHelper;
-import net.schueller.peertube.helper.MetaDataHelper;
-import net.schueller.peertube.intents.Intents;
-import net.schueller.peertube.model.Avatar;
-import net.schueller.peertube.model.Video;
-
-import java.util.ArrayList;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.recyclerview.widget.RecyclerView;
-
-import static net.schueller.peertube.activity.VideoListActivity.EXTRA_VIDEOID;
-
-public class ChannelAdapter extends RecyclerView.Adapter<ChannelAdapter.AccountViewHolder> {
-
-
-    private ArrayList<Video> videoList;
-    private Context context;
-    private String baseUrl;
-
-    public ChannelAdapter(ArrayList<Video> videoList, Context context) {
-        this.videoList = videoList;
-        this.context = context;
-    }
-
-    @NonNull
-    @Override
-    public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
-        View view = layoutInflater.inflate(R.layout.row_account_video, parent, false);
-
-        baseUrl = APIUrlHelper.getUrl(context);
-
-        return new AccountViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull AccountViewHolder holder, int position) {
-
-        Picasso.get()
-                .load(baseUrl + videoList.get(position).getPreviewPath())
-                .into(holder.thumb);
-
-
-        Avatar avatar = videoList.get(position).getAccount().getAvatar();
-        if (avatar != null) {
-            String avatarPath = avatar.getPath();
-            Picasso.get()
-                    .load(baseUrl + avatarPath)
-                    .into(holder.avatar);
-        }
-
-        // set Name
-        holder.name.setText(videoList.get(position).getName());
-
-        // set duration
-
-// TODO
-//        holder.videoDuration.setText( MetaDataHelper.getDuration(videoList.get(position).getDuration().toLong()));
-
-        // set age and view count
-        holder.videoMeta.setText(
-                MetaDataHelper.getMetaString(videoList.get(position).getCreatedAt(),
-                        videoList.get(position).getViews(),
-                        context,
-                        false
-                )
-        );
-
-        // set owner
-        holder.videoOwner.setText(
-                MetaDataHelper.getOwnerString(videoList.get(position).getAccount(),
-                        context, true
-                )
-        );
-
-        holder.mView.setOnClickListener(v -> {
-
-
-            Intent intent = new Intent(context,VideoPlayActivity.class);
-            intent.putExtra(EXTRA_VIDEOID, videoList.get(position).getUuid());
-            context.startActivity(intent);
-
-        });
-
-        holder.moreButton.setText(R.string.video_more_icon);
-        new Iconics.Builder().on(holder.moreButton).build();
-
-        holder.moreButton.setOnClickListener(v -> {
-
-            PopupMenu popup = new PopupMenu(context, v);
-            popup.setOnMenuItemClickListener(menuItem -> {
-                switch (menuItem.getItemId()) {
-                    case R.id.menu_share:
-                        Intents.Share(context, videoList.get(position));
-                        return true;
-                    default:
-                        return false;
-                }
-            });
-            popup.inflate(R.menu.menu_video_row_mode);
-            popup.show();
-
-        });
-
-    }
-
-    public void setData(ArrayList<Video> data) {
-        videoList.addAll(data);
-        this.notifyDataSetChanged();
-    }
-
-    public void clearData() {
-        videoList.clear();
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public int getItemCount() {
-        return videoList.size();
-    }
-
-    class AccountViewHolder extends RecyclerView.ViewHolder {
-
-        TextView name, videoMeta, videoOwner, moreButton, videoDuration;
-        ImageView thumb, avatar;
-        View mView;
-
-        AccountViewHolder(View itemView) {
-            super(itemView);
-            name = itemView.findViewById(R.id.sl_row_name);
-            thumb = itemView.findViewById(R.id.thumb);
-            avatar = itemView.findViewById(R.id.avatar);
-            videoMeta = itemView.findViewById(R.id.videoMeta);
-            videoOwner = itemView.findViewById(R.id.videoOwner);
-            moreButton = itemView.findViewById(R.id.moreButton);
-            videoDuration = itemView.findViewById(R.id.video_duration);
-            mView = itemView;
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/adapter/MultiViewRecycleViewAdapter.kt b/app/src/main/java/net/schueller/peertube/adapter/MultiViewRecycleViewAdapter.kt
deleted file mode 100644
index 6b21a64..0000000
--- a/app/src/main/java/net/schueller/peertube/adapter/MultiViewRecycleViewAdapter.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-package net.schueller.peertube.adapter;
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import net.schueller.peertube.R
-import net.schueller.peertube.databinding.*
-import net.schueller.peertube.fragment.VideoMetaDataFragment
-import net.schueller.peertube.model.*
-import net.schueller.peertube.model.ui.OverviewRecycleViewItem
-import net.schueller.peertube.model.ui.VideoMetaViewItem
-import java.util.ArrayList
-
-class MultiViewRecycleViewAdapter(private val videoMetaDataFragment: VideoMetaDataFragment? = null) : RecyclerView.Adapter<MultiViewRecyclerViewHolder>() {
-
-    private var items = ArrayList<OverviewRecycleViewItem>()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    fun setVideoListData(videoList: VideoList) {
-        items.addAll(videoList.videos)
-        notifyDataSetChanged()
-    }
-
-    fun setVideoData(videos: ArrayList<Video>) {
-        items.addAll(videos)
-        notifyDataSetChanged()
-    }
-
-    fun setVideoMeta(videoMetaViewItem: VideoMetaViewItem) {
-        items.add(videoMetaViewItem)
-        notifyDataSetChanged()
-    }
-
-    fun setCategoryTitle(category: Category) {
-        items.add(category)
-        notifyDataSetChanged()
-    }
-
-    fun setChannelTitle(channel: Channel) {
-        items.add(channel)
-        notifyDataSetChanged()
-    }
-
-    fun setTagTitle(tag: TagVideo) {
-        items.add(tag)
-        notifyDataSetChanged()
-    }
-
-    fun setVideoComment(commentThread: CommentThread) {
-        items.add(commentThread)
-        notifyDataSetChanged()
-    }
-
-    fun clearData() {
-        items.clear()
-        notifyDataSetChanged()
-    }
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MultiViewRecyclerViewHolder {
-        return when(viewType){
-            R.layout.item_category_title -> MultiViewRecyclerViewHolder.CategoryViewHolder(
-                ItemCategoryTitleBinding.inflate(
-                    LayoutInflater.from(parent.context),
-                    parent,
-                    false
-                )
-            )
-            R.layout.item_channel_title -> MultiViewRecyclerViewHolder.ChannelViewHolder(
-                ItemChannelTitleBinding.inflate(
-                    LayoutInflater.from(parent.context),
-                    parent,
-                    false
-                )
-            )
-            R.layout.item_tag_title -> MultiViewRecyclerViewHolder.TagViewHolder(
-                ItemTagTitleBinding.inflate(
-                    LayoutInflater.from(parent.context),
-                    parent,
-                    false
-                )
-            )
-            R.layout.row_video_list -> MultiViewRecyclerViewHolder.VideoViewHolder(
-                RowVideoListBinding.inflate(
-                    LayoutInflater.from(parent.context),
-                    parent,
-                    false
-                )
-            )
-            R.layout.item_video_meta -> MultiViewRecyclerViewHolder.VideoMetaViewHolder(
-                ItemVideoMetaBinding.inflate(
-                    LayoutInflater.from(parent.context),
-                    parent,
-                    false
-                ),
-                videoMetaDataFragment
-            )
-            R.layout.item_video_comments_overview -> MultiViewRecyclerViewHolder.VideoCommentsViewHolder(
-                ItemVideoCommentsOverviewBinding.inflate(
-                    LayoutInflater.from(parent.context),
-                    parent,
-                    false
-                )
-            )
-            else -> throw IllegalArgumentException("Invalid ViewType Provided")
-        }
-    }
-
-    override fun onBindViewHolder(holder: MultiViewRecyclerViewHolder, position: Int) {
-        when(holder){
-            is MultiViewRecyclerViewHolder.VideoViewHolder -> holder.bind(items[position] as Video)
-            is MultiViewRecyclerViewHolder.CategoryViewHolder -> holder.bind(items[position] as Category)
-            is MultiViewRecyclerViewHolder.ChannelViewHolder -> holder.bind(items[position] as Channel)
-            is MultiViewRecyclerViewHolder.TagViewHolder -> holder.bind(items[position] as TagVideo)
-            is MultiViewRecyclerViewHolder.VideoMetaViewHolder -> holder.bind(items[position] as VideoMetaViewItem)
-            is MultiViewRecyclerViewHolder.VideoCommentsViewHolder -> holder.bind(items[position] as CommentThread)
-        }
-    }
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int): Int {
-        return when(items[position]){
-            is Video -> R.layout.row_video_list
-            is Channel -> R.layout.item_channel_title
-            is Category -> R.layout.item_category_title
-            is TagVideo -> R.layout.item_tag_title
-            is VideoMetaViewItem -> R.layout.item_video_meta
-            is CommentThread -> R.layout.item_video_comments_overview
-            else -> { return 0}
-        }
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/adapter/MultiViewRecyclerViewHolder.kt b/app/src/main/java/net/schueller/peertube/adapter/MultiViewRecyclerViewHolder.kt
deleted file mode 100644
index 1631698..0000000
--- a/app/src/main/java/net/schueller/peertube/adapter/MultiViewRecyclerViewHolder.kt
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.adapter
-
-import android.app.AlertDialog
-import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
-import android.util.Log
-import android.view.MenuItem
-import android.view.View
-import android.view.View.GONE
-import android.widget.Toast
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
-import com.google.gson.JsonObject
-import com.mikepenz.iconics.Iconics.Builder
-import com.squareup.picasso.Picasso
-import net.schueller.peertube.R
-import net.schueller.peertube.R.*
-import net.schueller.peertube.activity.AccountActivity
-import net.schueller.peertube.activity.VideoListActivity
-import net.schueller.peertube.activity.VideoPlayActivity
-import net.schueller.peertube.databinding.*
-import net.schueller.peertube.fragment.VideoMetaDataFragment
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.helper.MetaDataHelper.getCreatorAvatar
-import net.schueller.peertube.helper.MetaDataHelper.getCreatorString
-import net.schueller.peertube.helper.MetaDataHelper.getDuration
-import net.schueller.peertube.helper.MetaDataHelper.getMetaString
-import net.schueller.peertube.helper.MetaDataHelper.getOwnerString
-import net.schueller.peertube.helper.MetaDataHelper.isChannel
-import net.schueller.peertube.intents.Intents
-import net.schueller.peertube.model.*
-import net.schueller.peertube.model.ui.VideoMetaViewItem
-import net.schueller.peertube.network.GetUserService
-import net.schueller.peertube.network.GetVideoDataService
-import net.schueller.peertube.network.RetrofitInstance
-import net.schueller.peertube.network.Session
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.ResponseBody
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-
-sealed class MultiViewRecyclerViewHolder(binding: ViewBinding) : RecyclerView.ViewHolder(binding.root) {
-
-    var videoRating: Rating? = null
-    var isLeaveAppExpected = false
-
-    class CategoryViewHolder(private val binding: ItemCategoryTitleBinding) : MultiViewRecyclerViewHolder(binding) {
-        fun bind(category: Category) {
-            binding.textViewTitle.text = category.label
-        }
-    }
-
-    class VideoCommentsViewHolder(private val binding: ItemVideoCommentsOverviewBinding) : MultiViewRecyclerViewHolder(binding) {
-        fun bind(commentThread: CommentThread) {
-
-            binding.videoCommentsTotalCount.text = commentThread.total.toString()
-
-            if (commentThread.comments.isNotEmpty()) {
-                val highlightedComment: Comment = commentThread.comments[0]
-
-                // owner / creator Avatar
-                val avatar = highlightedComment.account.avatar
-                if (avatar != null) {
-                    val baseUrl = APIUrlHelper.getUrl(binding.videoHighlightedAvatar.context)
-                    val avatarPath = avatar.path
-                    Picasso.get()
-                            .load(baseUrl + avatarPath)
-                            .into(binding.videoHighlightedAvatar)
-                }
-                binding.videoHighlightedComment.text = highlightedComment.text
-            }
-        }
-    }
-
-
-    class VideoMetaViewHolder(private val binding: ItemVideoMetaBinding, private val videoMetaDataFragment: VideoMetaDataFragment?) : MultiViewRecyclerViewHolder(binding) {
-        fun bind(videoMetaViewItem: VideoMetaViewItem) {
-
-            val video = videoMetaViewItem.video
-
-            if (video != null && videoMetaDataFragment != null) {
-
-                val context = binding.avatar.context
-                val apiBaseURL = APIUrlHelper.getUrlWithVersion(context)
-                val videoDataService = RetrofitInstance.getRetrofitInstance(
-                        apiBaseURL,
-                        APIUrlHelper.useInsecureConnection(context)
-                ).create(
-                        GetVideoDataService::class.java
-                )
-                val userService = RetrofitInstance.getRetrofitInstance(
-                        apiBaseURL,
-                        APIUrlHelper.useInsecureConnection(context)
-                ).create(
-                        GetUserService::class.java
-                )
-
-                // Title
-                binding.videoName.text = video.name
-                binding.videoOpenDescription.setOnClickListener {
-                    videoMetaDataFragment.showDescriptionFragment(video)
-                }
-
-                // Thumbs up
-                binding.videoThumbsUpWrapper.setOnClickListener {
-                    rateVideo(true, video, context, binding)
-                }
-
-                // Thumbs Down
-                binding.videoThumbsDownWrapper.setOnClickListener {
-                    rateVideo(false, video, context, binding)
-                }
-
-                // Add to playlist
-                binding.videoAddToPlaylistWrapper.setOnClickListener {
-                    videoMetaDataFragment.saveToPlaylist(video)
-                    Toast.makeText(context, context.getString(string.saved_to_playlist), Toast.LENGTH_SHORT).show()
-                }
-
-                binding.videoBlockWrapper.setOnClickListener {
-                    Toast.makeText(
-                            context,
-                            context.getString(string.video_feature_not_yet_implemented),
-                            Toast.LENGTH_SHORT
-                    ).show()
-                }
-
-                binding.videoFlagWrapper.setOnClickListener {
-                    Toast.makeText(
-                            context,
-                            context.getString(string.video_feature_not_yet_implemented),
-                            Toast.LENGTH_SHORT
-                    ).show()
-                }
-
-                // video rating
-                videoRating = Rating()
-                videoRating!!.rating = RATING_NONE // default
-                updateVideoRating(video, binding)
-
-                // Retrieve which rating the user gave to this video
-                if (Session.getInstance().isLoggedIn) {
-                    val call = videoDataService.getVideoRating(video.id)
-                    call.enqueue(object : Callback<Rating?> {
-                        override fun onResponse(call: Call<Rating?>, response: Response<Rating?>) {
-                            videoRating = response.body()
-                            updateVideoRating(video, binding)
-                        }
-
-                        override fun onFailure(call: Call<Rating?>, t: Throwable) {
-                            // Do nothing.
-                        }
-                    })
-                }
-
-                // Share
-                binding.videoShare.setOnClickListener {
-                    isLeaveAppExpected = true
-                    Intents.Share(context, video)
-                }
-
-                // hide download if not supported by video
-                if (video.downloadEnabled) {
-                    binding.videoDownloadWrapper.setOnClickListener {
-                        Intents.Download(context, video)
-                    }
-                } else {
-                    binding.videoDownloadWrapper.visibility = GONE
-                }
-
-                // created at / views
-                binding.videoMeta.text = getMetaString(
-                        video.createdAt,
-                        video.views,
-                        context,
-                        true
-                )
-
-                // owner / creator
-                val displayNameAndHost = getOwnerString(video.account, context)
-                if (isChannel(video)) {
-                    binding.videoBy.text = context.resources.getString(string.video_by_line, displayNameAndHost)
-                } else {
-                    binding.videoBy.visibility = GONE
-                }
-
-                binding.videoOwner.text = getCreatorString(video, context)
-
-                // owner / creator Avatar
-                val avatar = getCreatorAvatar(video, context)
-                if (avatar != null) {
-                    val baseUrl = APIUrlHelper.getUrl(context)
-                    val avatarPath = avatar.path
-                    Picasso.get()
-                            .load(baseUrl + avatarPath)
-                            .into(binding.avatar)
-                }
-
-                // videoOwnerSubscribers
-                binding.videoOwnerSubscribers.text = context.resources.getQuantityString(R.plurals.video_channel_subscribers, video.channel.followersCount, video.channel.followersCount)
-
-
-                // video owner click
-                binding.videoCreatorInfo.setOnClickListener {
-                    val intent = Intent(context, AccountActivity::class.java)
-                    intent.putExtra(VideoListActivity.EXTRA_ACCOUNTDISPLAYNAME, displayNameAndHost)
-                    context.startActivity(intent)
-                }
-
-                // avatar click
-                binding.avatar.setOnClickListener {
-                    val intent = Intent(context, AccountActivity::class.java)
-                    intent.putExtra(Companion.EXTRA_ACCOUNTDISPLAYNAME, displayNameAndHost)
-                    context.startActivity(intent)
-                }
-
-
-                // get subscription status
-                var isSubscribed = false
-
-                if (Session.getInstance().isLoggedIn) {
-                    val subChannel = video.channel.name + "@" + video.channel.host
-                    val call = userService.subscriptionsExist(subChannel)
-                    call.enqueue(object : Callback<JsonObject> {
-                        override fun onResponse(call: Call<JsonObject>, response: Response<JsonObject>) {
-                            if (response.isSuccessful) {
-                                // {"video.channel.name + "@" + video.channel.host":true}
-                                if (response.body()?.get(video.channel.name + "@" + video.channel.host)!!.asBoolean) {
-                                    binding.videoOwnerSubscribeButton.setText(string.unsubscribe)
-                                    isSubscribed = true
-                                } else {
-                                    binding.videoOwnerSubscribeButton.setText(string.subscribe)
-                                }
-                            }
-                        }
-
-                        override fun onFailure(call: Call<JsonObject>, t: Throwable) {
-                            // Do nothing.
-                        }
-                    })
-
-                }
-
-                // TODO: update subscriber count
-                binding.videoOwnerSubscribeButton.setOnClickListener {
-                    if (Session.getInstance().isLoggedIn) {
-                        if (!isSubscribed) {
-                            val payload = video.channel.name + "@" + video.channel.host
-                            val body = "{\"uri\":\"$payload\"}".toRequestBody("application/json".toMediaType())
-                            val call = userService.subscribe(body)
-                            call.enqueue(object : Callback<ResponseBody?> {
-                                override fun onResponse(
-                                        call: Call<ResponseBody?>,
-                                        response: Response<ResponseBody?>
-                                ) {
-                                    if (response.isSuccessful) {
-                                        binding.videoOwnerSubscribeButton.setText(string.unsubscribe)
-                                        isSubscribed = true
-                                    }
-                                }
-
-                                override fun onFailure(call: Call<ResponseBody?>, t: Throwable) {
-                                    // Do nothing.
-                                }
-                            })
-                        } else {
-                            AlertDialog.Builder(context)
-                                    .setTitle(context.getString(string.video_sub_del_alert_title))
-                                    .setMessage(context.getString(string.video_sub_del_alert_msg))
-                                    .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                                        // Yes
-                                        val payload = video.channel.name + "@" + video.channel.host
-                                        val call = userService.unsubscribe(payload)
-                                        call.enqueue(object : Callback<ResponseBody?> {
-                                            override fun onResponse(
-                                                    call: Call<ResponseBody?>,
-                                                    response: Response<ResponseBody?>
-                                            ) {
-                                                if (response.isSuccessful) {
-                                                    binding.videoOwnerSubscribeButton.setText(string.subscribe)
-                                                    isSubscribed = false
-                                                }
-                                            }
-
-                                            override fun onFailure(call: Call<ResponseBody?>, t: Throwable) {
-                                                // Do nothing.
-                                            }
-                                        })
-                                    }
-                                    .setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int ->
-                                        // No
-                                    }
-                                    .setIcon(android.R.drawable.ic_dialog_alert)
-                                    .show()
-                        }
-                    } else {
-                        Toast.makeText(
-                                context,
-                                context.getString(string.video_login_required_for_service),
-                                Toast.LENGTH_SHORT
-                        ).show()
-                    }
-                }
-            }
-
-
-        }
-    }
-
-    class ChannelViewHolder(private val binding: ItemChannelTitleBinding) : MultiViewRecyclerViewHolder(binding) {
-        fun bind(channel: Channel) {
-
-            val context = binding.avatar.context
-            val baseUrl = APIUrlHelper.getUrl(context)
-
-            // Avatar
-            val avatar: Avatar? = channel.avatar
-            if (avatar != null) {
-                val avatarPath = avatar.path
-                Picasso.get()
-                        .load(baseUrl + avatarPath)
-                        .placeholder(R.drawable.test_image)
-                        .into(binding.avatar)
-            }
-
-            binding.textViewTitle.text = channel.displayName
-        }
-    }
-
-    class TagViewHolder(private val binding: ItemTagTitleBinding) : MultiViewRecyclerViewHolder(binding) {
-        fun bind(tag: TagVideo) {
-            binding.textViewTitle.text = tag.tag
-        }
-    }
-
-    class VideoViewHolder(private val binding: RowVideoListBinding) : MultiViewRecyclerViewHolder(binding) {
-
-        fun bind(video: Video) {
-
-            val context = binding.thumb.context
-            val baseUrl = APIUrlHelper.getUrl(context)
-
-            // Temp Loading Image
-            Picasso.get()
-                    .load(baseUrl + video.previewPath)
-                    .placeholder(R.drawable.test_image)
-                    .error(R.drawable.test_image)
-                    .into(binding.thumb)
-
-            // Avatar
-            val avatar = getCreatorAvatar(video, context)
-            if (avatar != null) {
-                val avatarPath = avatar.path
-                Picasso.get()
-                        .load(baseUrl + avatarPath)
-                        .into(binding.avatar)
-            }
-            // set Name
-            binding.slRowName.text = video.name
-
-            // set duration (if not live stream)
-            if (video.live) {
-                binding.videoDuration.setText(string.video_list_live_marker)
-                binding.videoDuration.setBackgroundColor(ContextCompat.getColor(context, color.durationLiveBackgroundColor))
-            } else {
-                binding.videoDuration.text = getDuration(video.duration.toLong())
-                binding.videoDuration.setBackgroundColor(ContextCompat.getColor(context, color.durationBackgroundColor))
-            }
-
-            // set age and view count
-            binding.videoMeta.text = getMetaString(
-                    video.createdAt,
-                    video.views,
-                    context
-            )
-
-            // set owner
-            val displayNameAndHost = getOwnerString(video.account, context, true)
-            binding.videoOwner.text = getCreatorString(video, context, true)
-
-            // video owner click
-            binding.videoOwner.setOnClickListener {
-                val intent = Intent(context, AccountActivity::class.java)
-                intent.putExtra(VideoListActivity.EXTRA_ACCOUNTDISPLAYNAME, displayNameAndHost)
-                context.startActivity(intent)
-            }
-
-            // avatar click
-            binding.avatar.setOnClickListener {
-                val intent = Intent(context, AccountActivity::class.java)
-                intent.putExtra(Companion.EXTRA_ACCOUNTDISPLAYNAME, displayNameAndHost)
-                context.startActivity(intent)
-            }
-
-            // Video Click
-            binding.root.setOnClickListener {
-                val intent = Intent(context, VideoPlayActivity::class.java)
-                intent.putExtra(Companion.EXTRA_VIDEOID, video.uuid)
-                context.startActivity(intent)
-            }
-
-            // More Button
-            binding.moreButton.setText(string.video_more_icon)
-            Builder().on(binding.moreButton).build()
-
-            binding.moreButton.setOnClickListener { v: View? ->
-                val popup = PopupMenu(
-                        context,
-                        v!!
-                )
-                popup.setOnMenuItemClickListener { menuItem: MenuItem ->
-                    when (menuItem.itemId) {
-                        id.menu_share -> {
-                            Intents.Share(context, video)
-                            return@setOnMenuItemClickListener true
-                        }
-                        else -> return@setOnMenuItemClickListener false
-                    }
-                }
-                popup.inflate(menu.menu_video_row_mode)
-                popup.show()
-            }
-        }
-    }
-
-
-    fun updateVideoRating(video: Video?, binding: ItemVideoMetaBinding) {
-
-        when (videoRating!!.rating) {
-            RATING_NONE -> {
-                Log.v("MWCVH", "RATING_NONE")
-                binding.videoThumbsUp.setImageResource(R.drawable.ic_thumbs_up)
-                binding.videoThumbsDown.setImageResource(R.drawable.ic_thumbs_down)
-            }
-            RATING_LIKE -> {
-                Log.v("MWCVH", "RATING_LIKE")
-                binding.videoThumbsUp.setImageResource(R.drawable.ic_thumbs_up_filled)
-                binding.videoThumbsDown.setImageResource(R.drawable.ic_thumbs_down)
-            }
-            RATING_DISLIKE -> {
-                Log.v("MWCVH", "RATING_DISLIKE")
-                binding.videoThumbsUp.setImageResource(R.drawable.ic_thumbs_up)
-                binding.videoThumbsDown.setImageResource(R.drawable.ic_thumbs_down_filled)
-            }
-        }
-
-        // Update the texts
-        binding.videoThumbsUpTotal.text = video?.likes.toString()
-        binding.videoThumbsDownTotal.text = video?.dislikes.toString()
-
-    }
-
-    /**
-     * TODO: move this out and get update when rating changes
-     */
-    fun rateVideo(like: Boolean, video: Video, context: Context, binding: ItemVideoMetaBinding) {
-        if (Session.getInstance().isLoggedIn) {
-            val ratePayload: String = when (videoRating!!.rating) {
-                RATING_LIKE -> if (like) RATING_NONE else RATING_DISLIKE
-                RATING_DISLIKE -> if (like) RATING_LIKE else RATING_NONE
-                RATING_NONE -> if (like) RATING_LIKE else RATING_DISLIKE
-                else -> if (like) RATING_LIKE else RATING_DISLIKE
-            }
-
-            val body = "{\"rating\":\"$ratePayload\"}".toRequestBody("application/json".toMediaType())
-
-            val apiBaseURL = APIUrlHelper.getUrlWithVersion(context)
-            val videoDataService = RetrofitInstance.getRetrofitInstance(
-                    apiBaseURL, APIUrlHelper.useInsecureConnection(
-                    context
-            )
-            ).create(
-                    GetVideoDataService::class.java
-            )
-            val call = videoDataService.rateVideo(video.id, body)
-            call.enqueue(object : Callback<ResponseBody?> {
-                override fun onResponse(
-                        call: Call<ResponseBody?>,
-                        response: Response<ResponseBody?>
-                ) {
-                    // if 20x, update likes/dislikes
-                    if (response.isSuccessful) {
-                        val previousRating = videoRating!!.rating
-
-                        // Update the likes/dislikes count of the video, if needed.
-                        // This is only a visual trick, as the actual like/dislike count has
-                        // already been modified on the PeerTube instance.
-                        if (previousRating != ratePayload) {
-                            when (previousRating) {
-                                RATING_NONE -> if (ratePayload == RATING_LIKE) {
-                                    video.likes = video.likes + 1
-                                } else {
-                                    video.dislikes = video.dislikes + 1
-                                }
-                                RATING_LIKE -> {
-                                    video.likes = video.likes - 1
-                                    if (ratePayload == RATING_DISLIKE) {
-                                        video.dislikes = video.dislikes + 1
-                                    }
-                                }
-                                RATING_DISLIKE -> {
-                                    video.dislikes = video.dislikes - 1
-                                    if (ratePayload == RATING_LIKE) {
-                                        video.likes = video.likes + 1
-                                    }
-                                }
-                            }
-                        }
-                        videoRating!!.rating = ratePayload
-                        updateVideoRating(video, binding)
-                    }
-                }
-
-                override fun onFailure(call: Call<ResponseBody?>, t: Throwable) {
-                    Toast.makeText(
-                            context,
-                            context.getString(string.video_rating_failed),
-                            Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
-        } else {
-            Toast.makeText(
-                    context,
-                    context.getString(string.video_login_required_for_service),
-                    Toast.LENGTH_SHORT
-            ).show()
-        }
-    }
-
-    companion object {
-        private const val RATING_NONE = "none"
-        private const val RATING_LIKE = "like"
-        private const val RATING_DISLIKE = "dislike"
-        const val EXTRA_VIDEOID = "VIDEOID"
-        const val EXTRA_ACCOUNTDISPLAYNAME = "ACCOUNTDISPLAYNAMEANDHOST"
-
-    }
-
-}
diff --git a/app/src/main/java/net/schueller/peertube/adapter/PlaylistAdapter.kt b/app/src/main/java/net/schueller/peertube/adapter/PlaylistAdapter.kt
deleted file mode 100644
index 28a8e4f..0000000
--- a/app/src/main/java/net/schueller/peertube/adapter/PlaylistAdapter.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.adapter
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import net.schueller.peertube.database.Video
-import net.schueller.peertube.databinding.RowPlaylistBinding
-
-class PlaylistAdapter(private val mVideos: MutableList<Video>, private val onClick: (Video) -> Unit) : RecyclerView.Adapter<PlaylistAdapter.VideoViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VideoViewHolder {
-
-        val binding = RowPlaylistBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-
-        return VideoViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: VideoViewHolder, position: Int) {
-        holder.bind(mVideos[position])
-    }
-
-    fun setVideos(videos: List<Video>) {
-        mVideos.clear()
-        mVideos.addAll(videos)
-
-        notifyDataSetChanged()
-    }
-
-    override fun getItemCount(): Int {
-        return mVideos.size
-    }
-
-    inner class VideoViewHolder(private val binding: RowPlaylistBinding) : RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(video: Video) {
-
-            binding.videoName.text = video.videoName
-            binding.videoDescription.text = video.videoDescription
-
-            binding.root.setOnClickListener { onClick(video) }
-        }
-    }
-
-    fun getVideoAtPosition(position: Int): Video {
-        return mVideos[position]
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.kt b/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.kt
deleted file mode 100644
index e749ffe..0000000
--- a/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.adapter
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import net.schueller.peertube.adapter.ServerListAdapter.ServerViewHolder
-import net.schueller.peertube.database.Server
-import net.schueller.peertube.databinding.RowServerAddressBookBinding
-import net.schueller.peertube.utils.visibleIf
-
-class ServerListAdapter(private val mServers: MutableList<Server>, private val onClick: (Server) -> Unit, private val onEditClick: (Server) -> Unit) : RecyclerView.Adapter<ServerViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ServerViewHolder {
-
-        val binding = RowServerAddressBookBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-
-        return ServerViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: ServerViewHolder, position: Int) {
-        holder.bind(mServers[position])
-    }
-
-    fun setServers(servers: List<Server>) {
-        mServers.clear()
-        mServers.addAll(servers)
-
-        notifyDataSetChanged()
-    }
-
-    override fun getItemCount(): Int {
-        return mServers.size
-    }
-
-    inner class ServerViewHolder (private val binding: RowServerAddressBookBinding) : RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(server: Server) {
-
-            binding.serverLabelRow.text = server.serverName
-            binding.serverUrlRow.text = server.serverHost
-            binding.sbRowHasLoginIcon.visibleIf { server.username.isNullOrBlank().not() }
-
-            binding.root.setOnClickListener { onClick(server) }
-            binding.editIcon.setOnClickListener { onEditClick(server) }
-        }
-    }
-
-    fun getServerAtPosition(position: Int): Server {
-        return mServers[position]
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/adapter/ServerSearchAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/ServerSearchAdapter.java
deleted file mode 100644
index ab9dac9..0000000
--- a/app/src/main/java/net/schueller/peertube/adapter/ServerSearchAdapter.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.adapter;
-
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.activity.SearchServerActivity;
-import net.schueller.peertube.helper.APIUrlHelper;
-import net.schueller.peertube.model.Server;
-
-import java.util.ArrayList;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-
-import static android.app.Activity.RESULT_OK;
-
-
-public class ServerSearchAdapter extends RecyclerView.Adapter<ServerSearchAdapter.AccountViewHolder> {
-
-
-    private ArrayList<Server> serverList;
-    private SearchServerActivity activity;
-    private String baseUrl;
-
-    public ServerSearchAdapter(ArrayList<Server> serverList, SearchServerActivity activity) {
-        this.serverList = serverList;
-        this.activity = activity;
-    }
-
-    @NonNull
-    @Override
-    public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
-        View view = layoutInflater.inflate(R.layout.row_search_server, parent, false);
-
-        baseUrl = APIUrlHelper.getUrl(activity);
-
-        return new AccountViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull AccountViewHolder holder, int position) {
-
-        holder.name.setText(serverList.get(position).getName());
-        holder.host.setText(serverList.get(position).getHost());
-        holder.signupAllowed.setText(activity.getString(R.string.server_selection_signup_allowed, activity.getString(
-                serverList.get(position).getSignupAllowed() ?
-                        R.string.server_selection_signup_allowed_yes :
-                        R.string.server_selection_signup_allowed_no
-        )));
-
-        holder.videoTotals.setText(
-                activity.getString(R.string.server_selection_video_totals,
-                        serverList.get(position).getTotalVideos().toString(),
-                        serverList.get(position).getTotalLocalVideos().toString()
-                ));
-
-        // don't show description if it hasn't been changes from the default
-        if (!activity.getString(R.string.peertube_instance_search_default_description).equals(serverList.get(position).getShortDescription())) {
-            holder.shortDescription.setText(serverList.get(position).getShortDescription());
-            holder.shortDescription.setVisibility(View.VISIBLE);
-        } else {
-            holder.shortDescription.setVisibility(View.GONE);
-        }
-
-        DefaultArtifactVersion serverVersion = new DefaultArtifactVersion(serverList.get(position).getVersion());
-
-        // at least version 2.2
-        DefaultArtifactVersion minVersion22 = new DefaultArtifactVersion("2.2.0");
-        if (serverVersion.compareTo(minVersion22) >= 0) {
-            // show NSFW Icon
-            if (serverList.get(position).getNSFW()) {
-                holder.isNSFW.setVisibility(View.VISIBLE);
-            }
-        }
-
-
-        // select server
-        holder.itemView.setOnClickListener(v -> {
-
-            String serverUrl = APIUrlHelper.cleanServerUrl(serverList.get(position).getHost());
-
-            Toast.makeText(activity, activity.getString(R.string.server_selection_set_server, serverUrl), Toast.LENGTH_LONG).show();
-
-            Intent intent = new Intent();
-            intent.putExtra("serverUrl", serverUrl);
-            intent.putExtra("serverName", serverList.get(position).getName());
-            activity.setResult(RESULT_OK, intent);
-
-            activity.finish();
-
-        });
-
-//
-//
-//        holder.moreButton.setText(R.string.video_more_icon);
-//        new Iconics.Builder().on(holder.moreButton).build();
-//
-//        holder.moreButton.setOnClickListener(v -> {
-//
-//            PopupMenu popup = new PopupMenu(context, v);
-//            popup.setOnMenuItemClickListener(menuItem -> {
-//                switch (menuItem.getItemId()) {
-//                    case R.id.menu_share:
-//                        Intents.Share(context, serverList.get(position));
-//                        return true;
-//                    default:
-//                        return false;
-//                }
-//            });
-//            popup.inflate(R.menu.menu_video_row_mode);
-//            popup.show();
-//
-//        });
-
-    }
-
-    public void setData(ArrayList<Server> data) {
-        serverList.addAll(data);
-        this.notifyDataSetChanged();
-    }
-
-    public void clearData() {
-        serverList.clear();
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public int getItemCount() {
-        return serverList.size();
-    }
-
-    static class AccountViewHolder extends RecyclerView.ViewHolder {
-
-        TextView name, host, signupAllowed, shortDescription, videoTotals;
-        ImageView isNSFW;
-
-        AccountViewHolder(View itemView) {
-            super(itemView);
-            name = itemView.findViewById(R.id.sl_row_name);
-            host = itemView.findViewById(R.id.sl_row_host);
-            signupAllowed = itemView.findViewById(R.id.sl_row_signup_allowed);
-            shortDescription = itemView.findViewById(R.id.sl_row_short_description);
-            isNSFW = itemView.findViewById(R.id.sl_row_is_nsfw);
-            videoTotals = itemView.findViewById(R.id.sl_row_video_totals);
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/application/AppApplication.java b/app/src/main/java/net/schueller/peertube/application/AppApplication.java
deleted file mode 100644
index 940051c..0000000
--- a/app/src/main/java/net/schueller/peertube/application/AppApplication.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.application;
-
-import android.app.Application;
-import android.content.Context;
-
-public class AppApplication extends Application {
-    private static Application instance;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        instance = this;
-    }
-
-    public static Context getContext() {
-        return instance.getApplicationContext();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/AppDatabase.java b/app/src/main/java/net/schueller/peertube/database/AppDatabase.java
deleted file mode 100644
index 6f9807b..0000000
--- a/app/src/main/java/net/schueller/peertube/database/AppDatabase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database;
-
-import androidx.room.Database;
-import androidx.room.RoomDatabase;
-
-@Database(entities = {Server.class, Video.class}, version = 1)
-public abstract class AppDatabase extends RoomDatabase {
-    public abstract ServerDao serverDao();
-
-    public abstract VideoDao videoDao();
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/Server.kt b/app/src/main/java/net/schueller/peertube/database/Server.kt
deleted file mode 100644
index fda5781..0000000
--- a/app/src/main/java/net/schueller/peertube/database/Server.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database
-
-import android.os.Parcelable
-import androidx.room.PrimaryKey
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-@Entity(tableName = "server_table")
-data class Server(
-
-        @PrimaryKey(autoGenerate = true)
-        var id: Int = 0,
-
-        @ColumnInfo(name = "server_name")
-        var serverName: String,
-
-        @ColumnInfo(name = "server_host")
-        var serverHost: String? = null,
-
-        @ColumnInfo(name = "username")
-        var username: String? = null,
-
-        @ColumnInfo(name = "password")
-        var password: String? = null
-
-) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/ServerDao.kt b/app/src/main/java/net/schueller/peertube/database/ServerDao.kt
deleted file mode 100644
index a8d42ee..0000000
--- a/app/src/main/java/net/schueller/peertube/database/ServerDao.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database
-
-import androidx.lifecycle.LiveData
-import androidx.room.*
-
-@Dao
-interface ServerDao {
-
-    @Insert
-    suspend fun insert(server: Server)
-
-    @Update
-    suspend fun update(server: Server)
-
-    @Query("DELETE FROM server_table")
-    suspend fun deleteAll()
-
-    @Delete
-    suspend fun delete(server: Server)
-
-    @get:Query("SELECT * from server_table ORDER BY server_name DESC")
-    val allServers: LiveData<List<Server>>
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/ServerRepository.kt b/app/src/main/java/net/schueller/peertube/database/ServerRepository.kt
deleted file mode 100644
index c91d351..0000000
--- a/app/src/main/java/net/schueller/peertube/database/ServerRepository.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database
-
-import android.app.Application
-import androidx.lifecycle.LiveData
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-internal class ServerRepository(application: Application) {
-
-    private val mServerDao: ServerDao
-
-    val allServers: LiveData<List<Server>>
-        get() = mServerDao.allServers
-
-    init {
-        val db = ServerRoomDatabase.getDatabase(application)
-        mServerDao = db.serverDao()
-    }
-
-    suspend fun update(server: Server) = withContext(Dispatchers.IO) {
-        mServerDao.update(server)
-    }
-
-    suspend fun insert(server: Server) = withContext(Dispatchers.IO) {
-        mServerDao.insert(server)
-    }
-
-    suspend fun delete(server: Server) = withContext(Dispatchers.IO){
-        mServerDao.delete(server)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/ServerRoomDatabase.java b/app/src/main/java/net/schueller/peertube/database/ServerRoomDatabase.java
deleted file mode 100644
index b6b9281..0000000
--- a/app/src/main/java/net/schueller/peertube/database/ServerRoomDatabase.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database;
-
-import android.content.Context;
-
-import androidx.room.Database;
-import androidx.room.Room;
-import androidx.room.RoomDatabase;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Database(entities = {Server.class}, version = 1, exportSchema = false)
-public abstract class ServerRoomDatabase extends RoomDatabase {
-
-    public abstract ServerDao serverDao();
-
-    private static volatile ServerRoomDatabase INSTANCE;
-
-    private static final int NUMBER_OF_THREADS = 4;
-
-    static final ExecutorService databaseWriteExecutor =
-            Executors.newFixedThreadPool(NUMBER_OF_THREADS);
-
-    public static ServerRoomDatabase getDatabase(final Context context) {
-        if (INSTANCE == null) {
-            synchronized (ServerRoomDatabase.class) {
-                if (INSTANCE == null) {
-                    if (INSTANCE == null) {
-                        INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
-                                ServerRoomDatabase.class, "server_database")
-                                .build();
-                    }
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-}
-
diff --git a/app/src/main/java/net/schueller/peertube/database/ServerViewModel.kt b/app/src/main/java/net/schueller/peertube/database/ServerViewModel.kt
deleted file mode 100644
index da17ef9..0000000
--- a/app/src/main/java/net/schueller/peertube/database/ServerViewModel.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database
-
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.launch
-
-class ServerViewModel(application: Application) : AndroidViewModel(application) {
-
-    private val mRepository: ServerRepository = ServerRepository(application)
-    val allServers: LiveData<List<Server>> = mRepository.allServers
-
-    fun insert(server: Server) {
-        viewModelScope.launch {
-            mRepository.insert(server)
-        }
-    }
-
-    fun update(server: Server) {
-        viewModelScope.launch {
-            mRepository.update(server)
-        }
-    }
-
-    fun delete(server: Server) {
-        viewModelScope.launch {
-            mRepository.delete(server)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/Video.kt b/app/src/main/java/net/schueller/peertube/database/Video.kt
deleted file mode 100644
index 76c311c..0000000
--- a/app/src/main/java/net/schueller/peertube/database/Video.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.schueller.peertube.database
-
-import android.os.Parcelable
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import kotlinx.parcelize.Parcelize
-import java.util.*
-
-@Parcelize
-@Entity(tableName = "watch_later")
-data class Video(
-        @PrimaryKey(autoGenerate = true)
-        var id: Int = 0,
-
-        @ColumnInfo(name = "video_uuid")
-        var videoUUID: String,
-
-        @ColumnInfo(name = "video_name")
-        var videoName: String,
-
-        @ColumnInfo(name = "video_description")
-        var videoDescription: String?
-
-) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/VideoDao.kt b/app/src/main/java/net/schueller/peertube/database/VideoDao.kt
deleted file mode 100644
index 276904d..0000000
--- a/app/src/main/java/net/schueller/peertube/database/VideoDao.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database
-
-import androidx.lifecycle.LiveData
-import androidx.room.*
-
-@Dao
-interface VideoDao {
-
-    @Insert
-    suspend fun insert(video: Video)
-
-    @Update
-    suspend fun update(video: Video)
-
-    @Query("DELETE FROM watch_later")
-    suspend fun deleteAll()
-
-    @Delete
-    suspend fun delete(video: Video)
-
-    @get:Query("SELECT * from watch_later ORDER BY video_name DESC")
-    val allVideos: LiveData<List<Video>>
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/VideoRepository.kt b/app/src/main/java/net/schueller/peertube/database/VideoRepository.kt
deleted file mode 100644
index 8fc219f..0000000
--- a/app/src/main/java/net/schueller/peertube/database/VideoRepository.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database
-
-import android.app.Application
-import androidx.lifecycle.LiveData
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-internal class VideoRepository(application: Application) {
-
-    private val mVideoDao: VideoDao
-
-    val allVideos: LiveData<List<Video>>
-        get() = mVideoDao.allVideos
-
-    init {
-        val db = VideoRoomDatabase.getDatabase(application)
-        mVideoDao = db.videoDao()
-    }
-
-    suspend fun update(video: Video) = withContext(Dispatchers.IO) {
-        mVideoDao.update(video)
-    }
-
-    suspend fun insert(video: Video) = withContext(Dispatchers.IO) {
-        mVideoDao.insert(video)
-    }
-
-    suspend fun delete(video: Video) = withContext(Dispatchers.IO) {
-        mVideoDao.delete(video)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/VideoRoomDatabase.java b/app/src/main/java/net/schueller/peertube/database/VideoRoomDatabase.java
deleted file mode 100644
index 53f6647..0000000
--- a/app/src/main/java/net/schueller/peertube/database/VideoRoomDatabase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database;
-
-import android.content.Context;
-import androidx.room.Database;
-import androidx.room.Room;
-import androidx.room.RoomDatabase;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Database(entities = {Video.class}, version = 1, exportSchema = false)
-public abstract class VideoRoomDatabase extends RoomDatabase {
-
-    public abstract VideoDao videoDao();
-
-    private static volatile VideoRoomDatabase INSTANCE;
-
-    private static final int NUMBER_OF_THREADS = 4;
-
-    static final ExecutorService databaseWriteExecutor =
-            Executors.newFixedThreadPool(NUMBER_OF_THREADS);
-
-    public static VideoRoomDatabase getDatabase(final Context context) {
-        if (INSTANCE == null) {
-            synchronized (VideoRoomDatabase.class) {
-                if (INSTANCE == null) {
-                    if (INSTANCE == null) {
-                        INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
-                                        VideoRoomDatabase.class, "playlist_database")
-                                .build();
-                    }
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/database/VideoViewModel.kt b/app/src/main/java/net/schueller/peertube/database/VideoViewModel.kt
deleted file mode 100644
index d4fbe86..0000000
--- a/app/src/main/java/net/schueller/peertube/database/VideoViewModel.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.database
-
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.launch
-
-class VideoViewModel(application: Application) : AndroidViewModel(application) {
-
-    private val mRepository: VideoRepository = VideoRepository(application)
-    val allVideos: LiveData<List<Video>> = mRepository.allVideos
-
-    fun insert(video: Video) {
-        viewModelScope.launch {
-            mRepository.insert(video)
-        }
-    }
-
-    fun update(video: Video) {
-        viewModelScope.launch {
-            mRepository.update(video)
-        }
-    }
-
-    fun delete(video: Video) {
-        viewModelScope.launch {
-            mRepository.delete(video)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/AddServerAddress.kt b/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/AddServerAddress.kt
deleted file mode 100644
index 081fb3b..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/AddServerAddress.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.schueller.peertube.feature_server_address.domain.use_case
-
-import net.schueller.peertube.feature_server_address.domain.model.InvalidServerAddressException
-import net.schueller.peertube.feature_server_address.domain.model.ServerAddress
-import net.schueller.peertube.feature_server_address.domain.repository.ServerAddressRepository
-
-class AddServerAddress(
-    private val repository: ServerAddressRepository
-) {
-
-    @Throws(InvalidServerAddressException::class)
-    suspend operator fun invoke(serverAddress: ServerAddress) {
-        if(serverAddress.serverName.isBlank()) {
-            throw InvalidServerAddressException("Server Name is required")
-        }
-
-        repository.insertServerAddress(serverAddress)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/DeleteServerAddress.kt b/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/DeleteServerAddress.kt
deleted file mode 100644
index a31a52f..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/DeleteServerAddress.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.schueller.peertube.feature_server_address.domain.use_case
-
-import net.schueller.peertube.feature_server_address.domain.model.ServerAddress
-import net.schueller.peertube.feature_server_address.domain.repository.ServerAddressRepository
-
-class DeleteServerAddress(
-    private val repository: ServerAddressRepository
-) {
-
-    suspend operator fun invoke(serverAddress: ServerAddress) {
-        repository.deleteServerAddress(serverAddress)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/GetServerAddress.kt b/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/GetServerAddress.kt
deleted file mode 100644
index dc14dfe..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/GetServerAddress.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.schueller.peertube.feature_server_address.domain.use_case
-
-import net.schueller.peertube.feature_server_address.domain.model.ServerAddress
-import net.schueller.peertube.feature_server_address.domain.repository.ServerAddressRepository
-
-class GetServerAddress(
-    private val repository: ServerAddressRepository
-) {
-
-    suspend operator fun invoke(id: Int): ServerAddress? {
-        return repository.getServerAddressById(id)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/GetServerAddresses.kt b/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/GetServerAddresses.kt
deleted file mode 100644
index 7e75fe2..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/GetServerAddresses.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.schueller.peertube.feature_server_address.domain.use_case
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import net.schueller.peertube.feature_server_address.domain.model.ServerAddress
-import net.schueller.peertube.feature_server_address.domain.repository.ServerAddressRepository
-import net.schueller.peertube.feature_server_address.domain.util.OrderType
-import net.schueller.peertube.feature_server_address.domain.util.ServerAddressOrder
-
-class GetServerAddresses(
-    private val repository: ServerAddressRepository
-) {
-
-    operator fun invoke(
-        serverAddressOrder: ServerAddressOrder = ServerAddressOrder.Title(OrderType.Descending)
-    ): Flow<List<ServerAddress>> {
-        return repository.getServerAddresses().map { serverAddresses ->
-            when(serverAddressOrder.orderType) {
-                is OrderType.Ascending -> {
-                    when(serverAddressOrder) {
-                        is ServerAddressOrder.Title -> serverAddresses.sortedBy { it.serverName.lowercase() }
-                        is ServerAddressOrder.Host -> serverAddresses.sortedBy { it.serverHost?.lowercase() }
-                    }
-                }
-                is OrderType.Descending -> {
-                    when(serverAddressOrder) {
-                        is ServerAddressOrder.Title -> serverAddresses.sortedByDescending { it.serverName.lowercase() }
-                        is ServerAddressOrder.Host -> serverAddresses.sortedByDescending { it.serverHost?.lowercase() }
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/SelectServerAddress.kt b/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/SelectServerAddress.kt
deleted file mode 100644
index fadf1b0..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_server_address/domain/use_case/SelectServerAddress.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.schueller.peertube.feature_server_address.domain.use_case
-
-import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import net.schueller.peertube.common.Constants.PREF_API_BASE_KEY
-import net.schueller.peertube.feature_server_address.domain.model.ServerAddress
-import net.schueller.peertube.feature_video.data.remote.auth.LoginService
-import net.schueller.peertube.feature_video.data.remote.auth.Session
-
-
-class SelectServerAddress (
-    @ApplicationContext private val context: Context,
-    private val session: Session,
-    private val loginService: LoginService
-) {
-    private val sharedPreferences = context.getSharedPreferences(context.packageName + "_preferences", Context.MODE_PRIVATE)
-
-    operator fun invoke(serverAddress: ServerAddress) {
-
-        // save new server to pref
-        val editor = sharedPreferences.edit()
-        editor.putString(PREF_API_BASE_KEY, serverAddress.serverHost)
-        editor.apply()
-
-        // invalidate session
-        if (session.isLoggedIn()) {
-            session.invalidate()
-        }
-
-        // attempt auth if we have username
-        if (serverAddress.username.isNullOrBlank().not()) {
-            loginService.authenticate(serverAddress.username, serverAddress.password)
-        }
-
-        // TODO: notify views that this has changed
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoExploreViewModel.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoExploreViewModel.kt
deleted file mode 100644
index 371f8bf..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoExploreViewModel.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import net.schueller.peertube.common.Constants.VIDEOS_API_PAGE_SIZE
-import net.schueller.peertube.feature_video.domain.model.Overview
-import net.schueller.peertube.feature_video.domain.repository.VideoRepository
-import net.schueller.peertube.feature_video.domain.source.ExplorePagingSource
-import javax.inject.Inject
-
-@HiltViewModel
-class VideoExploreViewModel @Inject constructor(
-    private val repository: VideoRepository
-) : ViewModel() {
-
-    private val _videos = MutableStateFlow<PagingData<Overview>>(PagingData.empty())
-    val videos = _videos
-
-    init {
-        getVideos()
-    }
-
-    private fun getVideos() {
-        viewModelScope.launch {
-            Pager(
-                PagingConfig(
-                    pageSize = 1,
-                    maxSize = 5
-                )
-            ) {
-                ExplorePagingSource(repository)
-            }.flow.cachedIn(viewModelScope).collect {
-                _videos.value = it
-            }
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListEvent.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListEvent.kt
deleted file mode 100644
index 823caff..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListEvent.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list
-
-const val SET_DISCOVER = "discover"
-const val SET_LOCAL = "local"
-const val SET_RECENT = "recent"
-const val SET_TRENDING = "trending"
-const val SET_SUBSCRIPTIONS = "subscriptions"
-
-sealed class VideoListEvent {
-    data class UpdateQuery(
-        val set: String?
-    ): VideoListEvent()
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListScreen.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListScreen.kt
deleted file mode 100644
index 15da3c7..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListScreen.kt
+++ /dev/null
@@ -1,234 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list
-
-import android.util.Log
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.Composable
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.Scaffold
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
-import androidx.paging.LoadState
-import androidx.paging.compose.LazyPagingItems
-import androidx.paging.compose.collectAsLazyPagingItems
-import androidx.paging.compose.itemsIndexed
-import coil.annotation.ExperimentalCoilApi
-import com.google.accompanist.swiperefresh.SwipeRefresh
-import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
-import kotlinx.coroutines.flow.collectLatest
-import net.schueller.peertube.feature_video.domain.model.Overview
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.presentation.video_list.components.*
-import net.schueller.peertube.presentation.Screen
-import kotlin.math.roundToInt
-
-@ExperimentalCoilApi
-@Composable
-fun VideoListScreen(
-    navController: NavController,
-    viewModel: VideoListViewModel = hiltViewModel(),
-    viewExploreModel: VideoExploreViewModel = hiltViewModel()
-) {
-
-    val state = viewModel.state.value
-
-    val lazyVideoExploreItems: LazyPagingItems<Overview> = viewExploreModel.videos.collectAsLazyPagingItems()
-    val lazyVideoItems: LazyPagingItems<Video> = viewModel.videos.collectAsLazyPagingItems()
-
-    val listState = rememberLazyListState()
-
-    // Events
-    LaunchedEffect(key1 = true) {
-        viewModel.eventFlow.collectLatest { event ->
-            when(event) {
-                is VideoListViewModel.UiEvent.ScrollToTop -> {
-                    listState.scrollToItem(index = 0)
-                }
-            }
-        }
-    }
-
-    // Auto hide top appbar
-    val toolBarHeight = 56.dp
-    val toolBarHeightPx = with(LocalDensity.current) { toolBarHeight.roundToPx().toFloat()}
-    val toolBarOffsetHeightPx = remember { mutableStateOf(0f) }
-    val nestedScrollConnection = remember {
-        object : NestedScrollConnection {
-            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-                val delta = available.y
-                val newOffset = toolBarOffsetHeightPx.value + delta
-                toolBarOffsetHeightPx.value = newOffset.coerceIn(-toolBarHeightPx, 0f)
-                return Offset.Zero
-            }
-        }
-    }
-
-    Box(
-        Modifier
-            .fillMaxSize()
-            .nestedScroll(nestedScrollConnection)
-    )
-    {
-        Scaffold(
-            bottomBar = {
-                BottomBarComponent(navController)
-            }
-        ) {
-            SwipeRefresh(
-                state = rememberSwipeRefreshState(
-                    isRefreshing = (lazyVideoItems.loadState.refresh is LoadState.Loading) || (lazyVideoExploreItems.loadState.refresh is LoadState.Loading)
-                ),
-                onRefresh = {
-                    if (state.explore) {
-                        lazyVideoExploreItems.refresh()
-                    } else {
-                        lazyVideoItems.refresh()
-                    }
-                }
-            ) {
-                LazyColumn(
-                    contentPadding = PaddingValues(top = toolBarHeight),
-                    state = listState,
-                    modifier = Modifier.fillMaxSize()
-                ) {
-                    if (state.explore) {
-                        itemsIndexed(lazyVideoExploreItems) { _, overview ->
-                            if (overview != null) {
-                                // Categories
-                                if (overview.categories?.isNotEmpty() == true) {
-                                    overview.categories.forEach { categoryVideo ->
-                                        VideoCategory(categoryVideo.category)
-                                        if (categoryVideo.videos.isNotEmpty()) {
-                                            categoryVideo.videos.forEach { video ->
-                                                VideoListItem(
-                                                    video = video,
-                                                    onItemClick = {
-                                                        navController.navigate(Screen.VideoPlayScreen.route + "/${video.uuid}")
-                                                    }
-                                                )
-                                            }
-                                        }
-                                    }
-                                }
-                                // Channels
-                                if (overview.channels?.isNotEmpty() == true) {
-                                    overview.channels.forEach { channelVideo ->
-                                        VideoChannel(channelVideo.channel)
-                                        if (channelVideo.videos.isNotEmpty()) {
-                                            channelVideo.videos.forEach { video ->
-                                                VideoListItem(
-                                                    video = video,
-                                                    onItemClick = {
-                                                        navController.navigate(Screen.VideoPlayScreen.route + "/${video.uuid}")
-                                                    }
-                                                )
-                                            }
-                                        }
-                                    }
-                                }
-                                // Tags
-                                if (overview.tags?.isNotEmpty() == true) {
-                                    overview.tags.forEach { tagVideo ->
-                                        VideoTag(tagVideo.tag)
-                                        if (tagVideo.videos.isNotEmpty()) {
-                                            tagVideo.videos.forEach { video ->
-                                                VideoListItem(
-                                                    video = video,
-                                                    onItemClick = {
-                                                        navController.navigate(Screen.VideoPlayScreen.route + "/${video.uuid}")
-                                                    }
-                                                )
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        itemsIndexed(lazyVideoItems) { item, video ->
-                            if (video != null) {
-                                Log.v("VLV", video.id.toString() + "-" + item.toString())
-                                VideoListItem(
-                                    video = video,
-                                    onItemClick = {
-                                        navController.navigate(Screen.VideoPlayScreen.route + "/${video.uuid}")
-                                    }
-                                )
-                            }
-                        }
-                        lazyVideoItems.apply {
-                            when {
-                                loadState.refresh is LoadState.Loading -> {
-                                    item {
-    //                                    LoadingView(modifier = Modifier.fillParentMaxSize())
-                                    }
-                                }
-                                loadState.append is LoadState.Loading -> {
-                                    item {
-    //                                    LoadingItem()
-                                    }
-                                }
-                                loadState.refresh is LoadState.Error -> {
-                                    val e = lazyVideoItems.loadState.refresh as LoadState.Error
-                                    item {
-    //                                    ErrorItem(
-    //                                        message = e.error.localizedMessage!!,
-    //                                        modifier = Modifier.fillParentMaxSize(),
-    //                                        onClickRetry = { retry() }
-    //                                    )
-                                    }
-                                }
-                                loadState.append is LoadState.Error -> {
-                                    val e = lazyVideoItems.loadState.append as LoadState.Error
-                                    item {
-    //                                    ErrorItem(
-    //                                        message = e.error.localizedMessage!!,
-    //                                        onClickRetry = { retry() }
-    //                                    )
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // TODO: deal with errors, https://proandroiddev.com/infinite-lists-with-paging-3-in-jetpack-compose-b095533aefe6
-
-                }
-
-            }
-
-            // Place after list, so it floats above the list in z-height
-            TopAppBarComponent(
-                navController,
-                modifier = Modifier
-                    .height(toolBarHeight)
-                    .offset {
-                        IntOffset(x = 0, y = toolBarOffsetHeightPx.value.roundToInt())
-                    }
-            )
-    //        if(error) {
-    //            Text(
-    //                text = "Error Text",
-    //                color = MaterialTheme.colors.error,
-    //                textAlign = TextAlign.Center,
-    //                modifier = Modifier
-    //                    .fillMaxWidth()
-    //                    .padding(horizontal = 20.dp)
-    //                    .align(Alignment.Center)
-    //            )
-    //        }
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListState.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListState.kt
deleted file mode 100644
index a61cab0..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListState.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list
-
-data class VideoListState(
-    val sort: String? = null,
-    val filter: String? = null,
-    val nsfw: String? = null,
-    val languages: Set<String?>? = null,
-    val explore: Boolean = false,
-    val local: Boolean = false,
-    val subscriptions: Boolean = false
-)
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListViewModel.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListViewModel.kt
deleted file mode 100644
index 796910d..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/VideoListViewModel.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list
-
-import android.util.Log
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import net.schueller.peertube.common.Constants.VIDEOS_API_PAGE_SIZE
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.domain.repository.VideoRepository
-import net.schueller.peertube.feature_video.domain.source.VideoPagingSource
-import javax.inject.Inject
-
-@HiltViewModel
-class VideoListViewModel @Inject constructor(
-    private val repository: VideoRepository
-) : ViewModel() {
-
-    private val _state = mutableStateOf(VideoListState())
-    val state: State<VideoListState> = _state
-
-    private val _eventFlow = MutableSharedFlow<UiEvent>()
-    val eventFlow = _eventFlow.asSharedFlow()
-
-    private val _videos = MutableStateFlow<PagingData<Video>>(PagingData.empty())
-    val videos = _videos
-
-    init {
-        Log.v("VLM", "INIT")
-        getVideos()
-    }
-
-    private fun getVideos() {
-        viewModelScope.launch {
-            Pager(
-                PagingConfig(
-                    pageSize = VIDEOS_API_PAGE_SIZE,
-                    maxSize = 100
-                )
-            ) {
-                VideoPagingSource(
-                    repository,
-                    _state.value.sort,
-                    _state.value.nsfw,
-                    _state.value.filter,
-                    _state.value.languages
-                )
-            }.flow.cachedIn(viewModelScope).collect {
-                _videos.value = it
-            }
-        }
-    }
-
-    fun onEvent(event: VideoListEvent) {
-        when (event) {
-            is VideoListEvent.UpdateQuery -> {
-                viewModelScope.launch {
-
-                    when (event.set) {
-                        SET_DISCOVER -> {
-                            _state.value = VideoListState(
-                                explore = true,
-                                local = false,
-                                subscriptions = false,
-                            )
-                        }
-                        SET_TRENDING -> {
-                            _state.value = VideoListState(
-                                sort = "-trending",
-                                explore = false,
-                                local = false,
-                                subscriptions = false
-                            )
-                        }
-                        SET_RECENT -> {
-                            _state.value = VideoListState(
-                                sort = "-createdAt",
-                                explore = false,
-                                local = false,
-                                subscriptions = false
-                            )
-
-                        }
-                        SET_LOCAL -> {
-                            _state.value = VideoListState(
-                                sort = "-publishedAt",
-                                explore = false,
-                                local = true,
-                                subscriptions = false
-                            )
-                        }
-                        SET_SUBSCRIPTIONS -> {
-                            _state.value = VideoListState(
-                                explore = false,
-                                local = false,
-                                subscriptions = true
-                            )
-                        }
-                    }
-
-                    getVideos()
-
-                    Log.v("vvm", "Update sort: " + event.set)
-
-                    _eventFlow.emit(UiEvent.ScrollToTop)
-                }
-
-            }
-        }
-    }
-
-    sealed class UiEvent {
-        object ScrollToTop : UiEvent()
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/BottomBarComponent.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/BottomBarComponent.kt
deleted file mode 100644
index 28a9865..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/BottomBarComponent.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components
-
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
-import net.schueller.peertube.feature_video.presentation.video_list.VideoListEvent
-import net.schueller.peertube.feature_video.presentation.video_list.VideoListViewModel
-
-@Composable
-fun BottomBarComponent(
-    navController: NavController
-) {
-    BottomAppBar(
-        content = {
-            BottomNavigationBar(navController)
-        }
-    )
-}
-
-@Composable
-fun BottomNavigationBar(
-    navController: NavController,
-    videoListViewModel: VideoListViewModel = hiltViewModel()
-) {
-    val items = listOf(
-        BottomBarItems.Discover,
-        BottomBarItems.Trending,
-        BottomBarItems.Recent,
-        BottomBarItems.Local,
-        BottomBarItems.Subscriptions
-    )
-    BottomNavigation(
-        contentColor = Color.White
-    ) {
-//        val navBackStackEntry by navController.currentBackStackEntryAsState()
-//        val currentRoute = navBackStackEntry?.destination?.route
-        items.forEach { item ->
-            BottomNavigationItem(
-//                modifier = Modifier.width(105.dp),
-                icon = {
-                    Icon(painterResource(id = item.icon),
-                        contentDescription = item.title
-                    )
-
-                },
-                label = {
-                    Text(
-                        text = item.title,
-                        fontWeight = FontWeight.Normal,
-                        fontSize = 12.sp
-                    )
-                },
-                selectedContentColor = Color.White,
-                unselectedContentColor = Color.White.copy(0.75f),
-                alwaysShowLabel = true,
-                selected = false, //currentRoute == item.route,
-                onClick = {
-                    videoListViewModel.onEvent(
-                        VideoListEvent.UpdateQuery(
-                            set = item.set
-                        )
-                    )
-                    navController.navigate(item.route) {
-                        // Pop up to the start destination of the graph to
-                        // avoid building up a large stack of destinations
-                        // on the back stack as users select items
-                        navController.graph.startDestinationRoute?.let { route ->
-                            popUpTo(route) {
-                                saveState = true
-                            }
-                        }
-                        // Avoid multiple copies of the same destination when
-                        // reselecting the same item
-                        launchSingleTop = true
-                        // Restore state when reselecting a previously selected item
-                        restoreState = false
-                    }
-                }
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/BottomBarItems.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/BottomBarItems.kt
deleted file mode 100644
index 20e002d..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/BottomBarItems.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components
-
-import net.schueller.peertube.R
-import net.schueller.peertube.feature_video.presentation.video_list.*
-
-sealed class BottomBarItems(
-    var route: String,
-    var icon: Int,
-    var title: String,
-    var set: String
-) {
-    object Discover : BottomBarItems(
-        "video_list_screen",
-        R.drawable.ic_globe,
-        "Discover",
-        SET_DISCOVER
-    )
-
-    object Trending : BottomBarItems(
-        "video_list_screen",
-        R.drawable.ic_trending_up,
-        "Trending",
-        SET_TRENDING
-        )
-
-    object Recent : BottomBarItems(
-        "video_list_screen",
-        R.drawable.ic_plus_circle,
-        "Recent",
-        SET_RECENT
-    )
-
-    object Local : BottomBarItems(
-        "video_list_screen",
-        R.drawable.ic_local,
-        "Local",
-        SET_LOCAL
-    )
-
-    object Subscriptions : BottomBarItems(
-        "settings_screen",
-        R.drawable.ic_subscriptions,
-        "Subscriptions",
-        SET_SUBSCRIPTIONS
-    )
-}
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/TopAppBarComponent.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/TopAppBarComponent.kt
deleted file mode 100644
index d8c3d86..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/TopAppBarComponent.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components
-
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
-import coil.annotation.ExperimentalCoilApi
-import net.schueller.peertube.R
-import net.schueller.peertube.feature_video.presentation.me.MeViewModel
-import net.schueller.peertube.feature_video.presentation.me.components.MeAvatar
-
-@ExperimentalCoilApi
-@Composable
-fun TopAppBarComponent(
-    navController: NavController,
-    modifier: Modifier,
-    meViewModel: MeViewModel = hiltViewModel()
-) {
-    TopAppBar(
-        modifier = modifier,
-        title = { Text(text = "AppBar") },
-//        color = Color.White,
-        actions = {
-            IconButton(onClick = {
-                navController.navigate("address_list") {
-                    // Pop up to the start destination of the graph to
-                    // avoid building up a large stack of destinations
-                    // on the back stack as users select items
-                    navController.graph.startDestinationRoute?.let { route ->
-                        popUpTo(route) {
-                            saveState = true
-                        }
-                    }
-                    // Avoid multiple copies of the same destination when
-                    // reselecting the same item
-                    launchSingleTop = true
-                    // Restore state when reselecting a previously selected item
-                    restoreState = true
-                }
-            }) {
-                Icon(
-                    painterResource(id = R.drawable.ic_server),
-                    contentDescription = "Address Book"
-                )
-            }
-            MeAvatar(
-                avatar = meViewModel.stateMe.value.me?.account?.avatar,
-                onItemClick = {
-                    navController.navigate("me_screen")
-                }
-            )
-        }
-    )
-}
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoCategory.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoCategory.kt
deleted file mode 100644
index bcd2f1a..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoCategory.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components;
-
-
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable;
-import net.schueller.peertube.feature_video.domain.model.Category
-
-@Composable
-fun VideoCategory(
-        category: Category
-) {
-        Text(text = category.label)
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoChannel.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoChannel.kt
deleted file mode 100644
index 9f77e10..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoChannel.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components;
-
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable;
-import net.schueller.peertube.feature_video.domain.model.Channel
-
-@Composable
-fun VideoChannel(
-        channel: Channel
-) {
-        Text(text = channel.name)
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoListItem.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoListItem.kt
deleted file mode 100644
index beab775..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoListItem.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.constraintlayout.widget.Placeholder
-import coil.annotation.ExperimentalCoilApi
-import coil.compose.ImagePainter
-import coil.compose.rememberImagePainter
-import com.google.accompanist.placeholder.PlaceholderHighlight
-import com.google.accompanist.placeholder.material.fade
-import com.google.accompanist.placeholder.material.placeholder
-import net.schueller.peertube.R
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.presentation.common.*
-
-@ExperimentalCoilApi
-@Composable
-fun VideoListItem(
-    video: Video,
-    onItemClick: (Video) -> Unit
-) {
-    Card(
-        modifier = Modifier
-            .fillMaxWidth()
-            .wrapContentHeight()
-            .clickable { onItemClick(video) },
-        shape = RectangleShape,
-    ) {
-        Column (
-            modifier = Modifier
-                .background(MaterialTheme.colors.surface)
-                .fillMaxWidth(),
-//                .clickable { onItemClick(video) }
-        ) {
-            Box() {
-                val image = rememberImagePainter(
-                    data = getImageUrl(video.previewPath),
-//                    builder = {
-//                        placeholder(R.drawable.test_image)
-//                    }
-                )
-                Image(
-                    painter = image,
-                    contentDescription = null,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(240.dp)
-                        .placeholder(
-                            visible = (image.state is ImagePainter.State.Error || image.state is ImagePainter.State.Empty),
-                            highlight = PlaceholderHighlight.fade()
-                        ),
-                    contentScale = ContentScale.Crop
-                )
-                Box(
-                    modifier = Modifier
-                        .align(
-                            Alignment.BottomEnd
-                        )
-                        .padding(2.dp)
-                ) {
-                    VideoTime(video)
-                }
-            }
-
-            // Video Meta
-            Row(
-                modifier = Modifier
-                    .background(MaterialTheme.colors.surface)
-                    .height(84.dp) // TODO: not setting this causes odd up scroll effect
-            ) {
-                val avatar = rememberImagePainter(
-                    data  = getCreatorAvatarUrl(getCreatorAvatar(video))
-                )
-                Image(
-                    painter = avatar,
-                    contentDescription = null,
-                    modifier = Modifier
-                        .height(72.dp)
-                        .width(72.dp)
-                        .padding(12.dp)
-                        .clip(shape = RoundedCornerShape(100.dp))
-                        .placeholder(
-                            visible = (avatar.state is ImagePainter.State.Error || avatar.state is ImagePainter.State.Empty),
-                            highlight = if (avatar.state is ImagePainter.State.Empty) {
-                                PlaceholderHighlight.fade()
-                            } else {
-                                null
-                            },
-                        ),
-                    contentScale = ContentScale.Crop
-                )
-                Column (
-                    modifier = Modifier
-                        .padding(6.dp),
-                )
-                {
-                    Text(
-                        text = video.name ?: "No Name",
-                        fontWeight = FontWeight.Bold,
-                    )
-                    Text(
-                        text =  getMetaDataTag(video.createdAt, video.views, "",true),
-                        fontWeight = FontWeight.Normal,
-                        style = MaterialTheme.typography.caption
-                    )
-                    Text(
-                        text =  getCreatorString(video, true),
-                        fontWeight = FontWeight.Normal,
-                        style = MaterialTheme.typography.caption
-                    )
-                }
-            }
-
-        }
-
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoTag.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoTag.kt
deleted file mode 100644
index 6f2d4ed..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoTag.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components;
-
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-
-@Composable
-fun VideoTag(
-        tag: String
-) {
-        Text(text = tag)
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoTime.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoTime.kt
deleted file mode 100644
index 06aade9..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_list/components/VideoTime.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_list.components
-
-import android.text.format.DateUtils
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment.Companion.CenterVertically
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import net.schueller.peertube.R
-import net.schueller.peertube.feature_video.domain.model.Video
-
-
-@Composable
-fun VideoTime(
-    video: Video
-) {
-    val backgroundColor = if (video.isLive) {
-        Color(
-            red = 0xFF,
-            blue = 0,
-            green = 0,
-            alpha = 0xCC
-        )
-    } else {
-        Color(
-            red = 0,
-            blue = 0,
-            green = 0,
-            alpha = 0x99
-        )
-    }
-
-    val timeStamp = if (video.isLive) {
-        "LIVE"
-    } else {
-        getDuration(video.duration.toLong())
-    }
-
-    Box(
-        modifier = Modifier
-            .wrapContentHeight()
-            .background(
-                color = backgroundColor
-            )
-    ) {
-        Row() {
-            if (video.isLive) {
-                Icon(
-                    painterResource(id = R.drawable.ic_radio),
-                    contentDescription = "signupAllowed",
-                    modifier = Modifier.requiredSize(18.dp)
-                        .align(CenterVertically)
-                        .padding(
-                        start = 4.dp
-                    ),
-                    tint = Color(
-                        red = 0xFF,
-                        blue = 0xFF,
-                        green = 0xFF,
-                        alpha = 0xFF
-                    )
-                )
-            }
-            Text(
-                modifier = Modifier.padding(
-                    end = 4.dp,
-                    start = 4.dp
-                ),
-                color = Color(
-                    red = 0xFF,
-                    blue = 0xFF,
-                    green = 0xFF,
-                    alpha = 0xFF
-                ),
-                text = timeStamp,
-                fontWeight = FontWeight.Bold,
-                fontSize = 12.sp
-            )
-        }
-    }
-}
-
-@Composable
-fun getDuration(duration: Long?): String {
-    return DateUtils.formatElapsedTime(duration!!)
-}
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoDescriptionState.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoDescriptionState.kt
deleted file mode 100644
index c541bcc..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoDescriptionState.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play
-
-import net.schueller.peertube.feature_video.domain.model.Description
-
-data class VideoDescriptionState(
-    val isLoading: Boolean = false,
-    val description: Description? = null,
-    val error: String = ""
-)
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayEvent.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayEvent.kt
deleted file mode 100644
index f74a17d..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayEvent.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play
-
-import net.schueller.peertube.feature_video.domain.model.Video
-
-sealed class VideoPlayEvent {
-    data class ShareVideo(val video: Video): VideoPlayEvent()
-    data class UpVoteVideo(val video: Video): VideoPlayEvent()
-    data class DownVoteVideo(val video: Video): VideoPlayEvent()
-    data class DownloadVideo(val video: Video): VideoPlayEvent()
-    data class AddVideoToPlaylist(val video: Video): VideoPlayEvent()
-    data class FlagVideo(val video: Video): VideoPlayEvent()
-    data class BlockVideo(val video: Video): VideoPlayEvent()
-    data class OpenDescription(val video: Video): VideoPlayEvent()
-    object CloseDescription: VideoPlayEvent()
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayScreen.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayScreen.kt
deleted file mode 100644
index 362904c..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayScreen.kt
+++ /dev/null
@@ -1,216 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play
-
-import android.content.res.Configuration
-import android.widget.Toast
-import androidx.compose.animation.*
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
-import androidx.paging.compose.LazyPagingItems
-import androidx.paging.compose.collectAsLazyPagingItems
-import androidx.paging.compose.itemsIndexed
-import com.google.accompanist.systemuicontroller.SystemUiController
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import kotlinx.coroutines.flow.collectLatest
-import net.schueller.peertube.feature_server_address.presentation.address_add_edit.AddEditAddressViewModel
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.presentation.video_list.components.VideoListItem
-import net.schueller.peertube.feature_video.presentation.video_play.components.VideoDescriptionScreen
-import net.schueller.peertube.feature_video.presentation.video_play.components.VideoMeta
-import net.schueller.peertube.feature_video.presentation.video_play.components.VideoScreen
-import net.schueller.peertube.feature_video.presentation.video_play.player.ExoPlayerHolder
-import net.schueller.peertube.presentation.Screen
-
-
-var enteringPIPMode: Boolean = false
-
-@ExperimentalMaterialApi
-@Composable
-fun VideoPlayScreen(
-    exoPlayerHolder: ExoPlayerHolder,
-    navController: NavController,
-    viewModel: VideoPlayViewModel = hiltViewModel()
-) {
-    val state = viewModel.state.value
-    val context = LocalContext.current
-
-    var descriptionVisible by remember { mutableStateOf(false) }
-
-    // Show toasts
-    LaunchedEffect(key1 = true) {
-        viewModel.eventFlow.collectLatest { event ->
-            when(event) {
-                is VideoPlayViewModel.UiEvent.ShowToast -> {
-                    Toast.makeText(
-                        context,
-                        event.message,
-                        event.length
-                    ).show()
-                }
-                is VideoPlayViewModel.UiEvent.ShowDescription -> {
-                    descriptionVisible = true
-                }
-                is VideoPlayViewModel.UiEvent.HideDescription -> {
-                    descriptionVisible = false
-                }
-            }
-        }
-    }
-
-    // Related Videos
-    val lazyRelatedVideoItems: LazyPagingItems<Video> = viewModel.relatedVideos.collectAsLazyPagingItems()
-
-
-    Box(modifier = Modifier
-        .fillMaxSize()
-        .background(Color.Black)) {
-
-        val configuration = LocalConfiguration.current
-
-
-        state.video?.let { video ->
-
-            val systemUiController: SystemUiController = rememberSystemUiController()
-
-            when(configuration.orientation) {
-                Configuration.ORIENTATION_LANDSCAPE -> {
-                    // Full screen
-                    systemUiController.isStatusBarVisible = false
-                    systemUiController.isNavigationBarVisible = false
-                    systemUiController.isSystemBarsVisible = false
-
-                    VideoScreen(exoPlayerHolder, video)
-
-                } else -> {
-                    systemUiController.isStatusBarVisible = true
-                    systemUiController.isNavigationBarVisible = true
-                    systemUiController.isSystemBarsVisible = true
-
-                    // TODO: Swipe video down
-                    val squareSize = 200.dp
-                    val swipeableState = rememberSwipeableState(initialValue = 0)
-                    val sizePx = with(LocalDensity.current) { squareSize.toPx() }
-                    val anchors = mapOf(sizePx to 1, 0f to 0)
-
-                    Column(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .swipeable(
-                                state = swipeableState,
-                                anchors = anchors,
-                                thresholds = { _, _ -> FractionalThreshold(0.3f) },
-                                orientation = Orientation.Vertical,
-                            )
-                    ) {
-                        VideoScreen(exoPlayerHolder, video)
-
-                        Box() {
-                            LazyColumn(
-                                modifier = Modifier.fillMaxSize()
-                            ) {
-                                item {
-                                    VideoMeta(video)
-                                }
-
-                                itemsIndexed(lazyRelatedVideoItems) { _, video ->
-                                    if (video != null) {
-                                        VideoListItem(
-                                            video = video,
-                                            onItemClick = {
-                                                navController.navigate(Screen.VideoPlayScreen.route + "/${video.uuid}")
-                                            }
-                                        )
-                                    }
-                                }
-
-                            }
-
-                            Column(Modifier.fillMaxSize()) {
-                                AnimatedVisibility(
-                                    visible = descriptionVisible,
-                                    modifier = Modifier.fillMaxSize(),
-                                    enter = slideInVertically(
-                                        initialOffsetY = { it }, // it == fullWidth
-                                        animationSpec = tween(
-                                            durationMillis = 150,
-                                            easing = LinearEasing
-                                        )
-                                    ),
-                                    exit = slideOutVertically(
-                                        targetOffsetY = { it },
-                                        animationSpec = tween(
-                                            durationMillis = 150,
-                                            easing = LinearEasing
-                                        )
-                                    )
-                                ) {
-                                    VideoDescriptionScreen()
-                                }
-                            }
-                        }
-                    }
-
-                }
-            }
-        }
-        if(state.error.isNotBlank()) {
-            Text(
-                text = state.error,
-                color = MaterialTheme.colors.error,
-                textAlign = TextAlign.Center,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 20.dp)
-                    .align(Alignment.Center)
-            )
-        }
-        if(state.isLoading) {
-            CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
-        }
-    }
-//    BackHandler(enabled = true) {
-//        Log.v("back", "back pressed")
-//
-//        enterPIPMode(activity)
-//    }
-}
-
-//fun enterPIPMode(activity: Activity): Boolean {
-//    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//        if (enteringPIPMode) {
-//            return true
-//        }
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-//        ) {
-//            enteringPIPMode = true
-//            val params = PictureInPictureParams.Builder().build()
-//            try {
-//                activity.enterPictureInPictureMode(params)
-//                return true
-//            } catch (ex: IllegalStateException) {
-//                // pass
-//                enteringPIPMode = false
-//            }
-//        }
-//    }
-//    return false
-//}
-
-
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayState.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayState.kt
deleted file mode 100644
index 251d1e2..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayState.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play
-
-import net.schueller.peertube.feature_video.domain.model.Description
-import net.schueller.peertube.feature_video.domain.model.Rating
-import net.schueller.peertube.feature_video.domain.model.Video
-
-data class VideoPlayState(
-    val isLoading: Boolean = false,
-    val video: Video? = null,
-    val rating: Rating? = null,
-    val error: String = ""
-)
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayViewModel.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayViewModel.kt
deleted file mode 100644
index 56245c9..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/VideoPlayViewModel.kt
+++ /dev/null
@@ -1,217 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play
-
-import android.widget.Toast
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import net.schueller.peertube.common.Constants
-import net.schueller.peertube.common.Resource
-import net.schueller.peertube.feature_video.data.remote.auth.Session
-import net.schueller.peertube.feature_video.domain.model.Description
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.domain.repository.VideoRepository
-import net.schueller.peertube.feature_video.domain.source.VideoPagingSource
-import net.schueller.peertube.feature_video.domain.source.PlaylistVideoPagingSource
-import net.schueller.peertube.feature_video.domain.use_case.*
-import javax.inject.Inject
-
-@HiltViewModel
-class VideoPlayViewModel @Inject constructor(
-    private val getVideoUseCase: GetVideoUseCase,
-    private val upVoteVideoUseCase: UpVoteVideoUseCase,
-    private val downVoteVideoUseCase: DownVoteVideoUseCase,
-    private val shareVideoUseCase: ShareVideoUseCase,
-    private val downloadVideoUseCase: DownloadVideoUseCase,
-    private val addVideoToPlaylistUseCase: AddVideoToPlaylistUseCase,
-    private val blockVideoUseCase: BlockVideoUseCase,
-    private val flagVideoUseCase: FlagVideoUseCase,
-    private val getVideoRatingUseCase: GetVideoRatingUseCase,
-    private val getVideoDescriptionUseCase: GetVideoDescriptionUseCase,
-    private val session: Session,
-    private val repository: VideoRepository,
-    savedStateHandle: SavedStateHandle
-) : ViewModel() {
-
-    private val _state = mutableStateOf(VideoPlayState())
-    val state: State<VideoPlayState> = _state
-
-    private val _stateVideoDescription = mutableStateOf(VideoDescriptionState())
-    val stateVideoDescription: State<VideoDescriptionState> = _stateVideoDescription
-
-    private val _eventFlow = MutableSharedFlow<UiEvent>()
-    val eventFlow = _eventFlow.asSharedFlow()
-
-    init {
-        savedStateHandle.get<String>(Constants.PARAM_VIDEO_UUID)?.let { uuid ->
-            getVideo(uuid)
-            getDescription(uuid)
-        }
-
-    }
-
-
-    var relatedVideos: Flow<PagingData<Video>> = Pager(
-        PagingConfig(
-            pageSize = Constants.VIDEOS_API_PAGE_SIZE,
-            maxSize = 100
-        )
-    ) {
-//        if (session.isLoggedIn()) {
-//            PlaylistVideoPagingSource(repository, "-publishedAt", video)
-//        } else {
-            VideoPagingSource(repository, "-publishedAt", null, null ,null)
-//        }
-
-    }.flow.cachedIn(viewModelScope)
-
-
-    private fun getDescription(uuid: String) {
-        // get description data
-        getVideoDescriptionUseCase(uuid).onEach { result ->
-            when (result) {
-                is Resource.Success -> {
-                    _stateVideoDescription.value = VideoDescriptionState(description = result.data)
-
-                }
-                is Resource.Error -> {
-                    _stateVideoDescription.value = VideoDescriptionState(
-                        error = result.message ?: "An unexpected error occurred"
-                    )
-                }
-                is Resource.Loading -> {
-                    _stateVideoDescription.value = VideoDescriptionState(isLoading = true)
-                }
-            }
-        }.launchIn(viewModelScope)
-    }
-
-    private fun getVideo(uuid: String) {
-        getVideoUseCase(uuid).onEach { result ->
-            when (result) {
-                is Resource.Success -> {
-                    _state.value = VideoPlayState(video = result.data)
-                    // Add short description
-                    _stateVideoDescription.value = VideoDescriptionState(description = Description(description = result.data?.description ?: "") )
-                    if (result.data != null) {
-                        getRating(result.data.id)
-
-
-
-                    }
-                }
-                is Resource.Error -> {
-                    _state.value = VideoPlayState(
-                        error = result.message ?: "An unexpected error occurred"
-                    )
-                }
-                is Resource.Loading -> {
-                    _state.value = VideoPlayState(isLoading = true)
-                }
-            }
-        }.launchIn(viewModelScope)
-    }
-
-    fun onEvent(event: VideoPlayEvent) {
-        when (event) {
-            is VideoPlayEvent.UpVoteVideo -> {
-                viewModelScope.launch {
-                    if (session.isLoggedIn()) {
-                        // TODO: must be logged in
-                        upVoteVideoUseCase(event.video).onEach { result ->
-                            when (result) {
-                                is Resource.Success -> {
-                                    // Update rating
-                                    if (result.data != null) {
-                                        getRating(result.data.id)
-                                    }
-                                }
-                                else -> {
-                                }
-                            }
-                        }.launchIn(viewModelScope)
-                    } else {
-                        _eventFlow.emit(UiEvent.ShowToast("You must be logged in", Toast.LENGTH_SHORT))
-                    }
-                }
-
-            }
-            is VideoPlayEvent.DownVoteVideo -> {
-                viewModelScope.launch {
-                    if (session.isLoggedIn()) {
-                        // TODO: must be logged in
-                        downVoteVideoUseCase(event.video).onEach { result ->
-                            when (result) {
-                                is Resource.Success -> {
-                                    // Update rating
-                                    if (result.data != null) {
-                                        getRating(result.data.id)
-                                    }
-                                }
-                                else -> {
-                                }
-                            }
-                        }.launchIn(viewModelScope)
-                    } else {
-                        _eventFlow.emit(UiEvent.ShowToast("You must be logged in", Toast.LENGTH_SHORT))
-                    }
-                }
-            }
-            is VideoPlayEvent.ShareVideo -> {
-                shareVideoUseCase(event.video)
-            }
-            is VideoPlayEvent.AddVideoToPlaylist -> {
-                addVideoToPlaylistUseCase(event.video)
-            }
-            is VideoPlayEvent.BlockVideo -> {
-                blockVideoUseCase(event.video)
-            }
-            is VideoPlayEvent.FlagVideo -> {
-                flagVideoUseCase(event.video)
-            }
-            is VideoPlayEvent.DownloadVideo -> {
-                // TODO: permissions
-                downloadVideoUseCase(event.video)
-            }
-            is VideoPlayEvent.OpenDescription -> {
-                // Show description before we have the data
-                viewModelScope.launch {
-                    _eventFlow.emit(UiEvent.ShowDescription)
-                }
-
-            }
-            is VideoPlayEvent.CloseDescription -> {
-                viewModelScope.launch {
-                    _eventFlow.emit(UiEvent.HideDescription)
-                }
-            }
-        }
-    }
-
-    private fun getRating(id: Int) {
-        getVideoRatingUseCase(id).onEach { res ->
-            when(res) {
-                is Resource.Success -> {
-                    _state.value = VideoPlayState(rating = res.data)
-                }
-                else -> {
-                    // error rating
-                }
-            }
-        }
-    }
-
-    sealed class UiEvent {
-        data class ShowToast(val message: String, val length: Int): UiEvent()
-        object ShowDescription : UiEvent()
-        object HideDescription : UiEvent()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoActions.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoActions.kt
deleted file mode 100644
index 22b3b00..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoActions.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.components
-
-import android.util.Log
-import android.widget.ScrollView
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.ViewModel
-import com.google.android.material.internal.ContextUtils
-import com.google.android.material.internal.ContextUtils.getActivity
-import net.schueller.peertube.R
-import net.schueller.peertube.feature_server_address.domain.model.Server
-import net.schueller.peertube.feature_server_address.presentation.address_add_edit.AddEditAddressEvent
-import net.schueller.peertube.feature_video.domain.model.RATING_DISLIKE
-import net.schueller.peertube.feature_video.domain.model.RATING_LIKE
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.presentation.video_play.VideoPlayEvent
-import net.schueller.peertube.feature_video.presentation.video_play.VideoPlayViewModel
-
-
-@Composable
-fun VideoActions(
-    video: Video,
-    viewModel: VideoPlayViewModel = hiltViewModel()
-) {
-
-    val state = viewModel.state.value
-
-    Row(
-        modifier = Modifier
-            .padding(6.dp)
-            .fillMaxWidth()
-            .horizontalScroll(rememberScrollState())
-    ) {
-
-        val thumbsUpIcon = if (state.rating?.rating === RATING_LIKE) {
-            R.drawable.ic_thumbs_up_filled
-        } else {
-            R.drawable.ic_thumbs_up
-        }
-
-        VideoAction(thumbsUpIcon, "Thumbs Up", video.likes.toString()) {
-            viewModel.onEvent(VideoPlayEvent.UpVoteVideo(video))
-        }
-
-        val thumbsDownIcon = if (state.rating?.rating === RATING_DISLIKE) {
-            R.drawable.ic_thumbs_down_filled
-        } else {
-            R.drawable.ic_thumbs_down
-        }
-
-        VideoAction(thumbsDownIcon, "Thumbs Down", video.dislikes.toString()) {
-            viewModel.onEvent(VideoPlayEvent.DownVoteVideo(video))
-        }
-
-        VideoAction(R.drawable.ic_share_2, "Share", "Share") {
-            viewModel.onEvent(VideoPlayEvent.ShareVideo(video))
-        }
-
-        if (video.downloadEnabled == true) {
-            VideoAction(R.drawable.ic_download, "Download", "Download") {
-                viewModel.onEvent(VideoPlayEvent.DownloadVideo(video))
-            }
-        }
-
-        VideoAction(R.drawable.ic_playlist_add, "Add to Playlist", "Add") {
-            viewModel.onEvent(VideoPlayEvent.AddVideoToPlaylist(video))
-        }
-
-        VideoAction(R.drawable.ic_slash, "Block", "Block") {
-            viewModel.onEvent(VideoPlayEvent.BlockVideo(video))
-        }
-
-        VideoAction(R.drawable.ic_flag, "Flag", "Flag") {
-            viewModel.onEvent(VideoPlayEvent.FlagVideo(video))
-        }
-
-    }
-    
-}
-
-@Composable
-fun VideoAction(
-    icon: Int,
-    iconText: String,
-    text: String,
-    onClick: () -> Unit
-) {
-    Column(
-        modifier = Modifier
-            .padding(
-                top = 8.dp,
-                bottom = 8.dp,
-                start = 8.dp,
-                end = 8.dp
-            )
-            .width(56.dp)
-            .clickable(
-                onClick = onClick
-            ),
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Icon(
-            painterResource(id = icon),
-            modifier = Modifier
-                .size(28.dp)
-                .padding(bottom = 4.dp),
-            contentDescription = iconText
-        )
-        Text(
-            text = text,
-            fontWeight = FontWeight.Normal,
-            style = MaterialTheme.typography.caption
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoDescriptionScreen.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoDescriptionScreen.kt
deleted file mode 100644
index 175973e..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoDescriptionScreen.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import net.schueller.peertube.feature_video.presentation.video_play.VideoPlayEvent
-import net.schueller.peertube.feature_video.presentation.video_play.VideoPlayViewModel
-
-@Composable
-fun VideoDescriptionScreen(
-    viewModel: VideoPlayViewModel = hiltViewModel()
-) {
-
-    val state = viewModel.stateVideoDescription.value
-
-    Box(modifier = Modifier
-        .fillMaxSize()
-        .background(MaterialTheme.colors.background)
-    ) {
-
-        state.description?.let { description ->
-            Column() {
-                Button(
-                    onClick = {
-                        viewModel.onEvent(VideoPlayEvent.CloseDescription)
-                    }
-                ) {
-
-                }
-                Text(
-                    text = description.description,
-                    color = MaterialTheme.colors.onBackground,
-                    textAlign = TextAlign.Left,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 20.dp)
-                )
-            }
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoItem.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoItem.kt
deleted file mode 100644
index f0df136..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoItem.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-//package net.schueller.peertube.feature_video.presentation.video_play.components
-//
-//import android.app.Activity
-//import android.net.Uri
-//import android.view.ViewGroup
-//import android.widget.FrameLayout
-//import androidx.compose.foundation.layout.fillMaxSize
-//import androidx.compose.material.Surface
-//import androidx.compose.runtime.Composable
-//import androidx.compose.runtime.DisposableEffect
-//import androidx.compose.runtime.LaunchedEffect
-//import androidx.compose.runtime.remember
-//import androidx.compose.ui.Modifier
-//import androidx.compose.ui.platform.LocalContext
-//import androidx.compose.ui.viewinterop.AndroidView
-//import com.google.android.exoplayer2.C
-//import com.google.android.exoplayer2.MediaItem
-//import com.google.android.exoplayer2.source.ProgressiveMediaSource
-//import com.google.android.exoplayer2.source.dash.DashMediaSource
-//import com.google.android.exoplayer2.source.hls.HlsMediaSource
-//import com.google.android.exoplayer2.ui.PlayerView
-//import com.google.android.exoplayer2.util.Util
-//import net.schueller.peertube.common.VideoHelper
-//import net.schueller.peertube.feature_video.domain.model.Video
-//import net.schueller.peertube.feature_video.presentation.video_play.player.DataSourceHolder
-//import net.schueller.peertube.feature_video.presentation.video_play.player.PlayerViewPool
-//import net.schueller.peertube.feature_video.presentation.video_play.player.ExoPlayerHolder
-//
-//
-//@Composable
-//fun VideoItem(
-//    video: Video,
-//    modifier: Modifier
-//) {
-//    Surface(
-//        modifier = modifier
-//    ) {
-//        val videoHelper = VideoHelper()
-//
-//        val context = LocalContext.current
-//        val activity = context as Activity
-//        val exoPlayer = remember { ExoPlayerHolder.get(context) }
-//        var playerView: PlayerView? = null
-//
-//        LaunchedEffect(videoHelper.pickPlaybackResolution(video)) {
-//            val videoUri = Uri.parse(videoHelper.pickPlaybackResolution(video))
-//            val dataSourceFactory = DataSourceHolder.getCacheFactory(context)
-//            val source = when (Util.inferContentType(videoUri)) {
-//                C.TYPE_DASH -> DashMediaSource.Factory(dataSourceFactory)
-//                    .createMediaSource(MediaItem.fromUri(videoUri))
-//                C.TYPE_HLS -> HlsMediaSource.Factory(dataSourceFactory)
-//                    .createMediaSource(MediaItem.fromUri(videoUri))
-//                else -> ProgressiveMediaSource.Factory(dataSourceFactory)
-//                    .createMediaSource(MediaItem.fromUri(videoUri))
-//            }
-//            exoPlayer.setMediaSource(source)
-//            exoPlayer.prepare()
-//        }
-//
-//
-//        AndroidView(
-////                modifier = Modifier.aspectRatio(video.width.toFloat() / video.height.toFloat()),
-//            factory = { context ->
-//                val frameLayout = FrameLayout(context)
-////                    frameLayout.setBackgroundColor(context.getColor(android.R.color.holo_blue_bright))
-//                frameLayout
-//            },
-//            update = { frameLayout ->
-//                frameLayout.removeAllViews()
-//
-//                    playerView = PlayerViewPool.get(frameLayout.context)
-//                    PlayerView.switchTargetView(
-//                        exoPlayer,
-//                        PlayerViewPool.currentPlayerView,
-//                        playerView
-//                    )
-//                    PlayerViewPool.currentPlayerView = playerView
-//                    playerView!!.apply {
-//                        player!!.playWhenReady = true
-//                    }
-//
-//                    playerView?.apply {
-//                        (parent as? ViewGroup)?.removeView(this)
-//                    }
-//                    frameLayout.addView(
-//                        playerView,
-//                        FrameLayout.LayoutParams.MATCH_PARENT,
-//                        FrameLayout.LayoutParams.MATCH_PARENT
-//                    )
-////
-////                    playerView?.apply {
-////                        (parent as? ViewGroup)?.removeView(this)
-////                        PlayerViewPool.release(this)
-////                    }
-////                    playerView = null
-//
-//            }
-//        )
-//
-//        DisposableEffect(key1 = videoHelper.pickPlaybackResolution(video)) {
-//            onDispose {
-//                playerView?.apply {
-//                    (parent as? ViewGroup)?.removeView(this)
-//                }
-//                exoPlayer.stop()
-//                playerView?.let {
-//                    PlayerViewPool.release(it)
-//                }
-//                playerView = null
-//
-//            }
-//        }
-//
-//    }
-//}
-//
-//
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoMeta.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoMeta.kt
deleted file mode 100644
index c629f53..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoMeta.kt
+++ /dev/null
@@ -1,168 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.components
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material3.Icon
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import coil.annotation.ExperimentalCoilApi
-import coil.compose.ImagePainter
-import coil.compose.rememberImagePainter
-import com.google.accompanist.placeholder.PlaceholderHighlight
-import com.google.accompanist.placeholder.material.fade
-import com.google.accompanist.placeholder.material.placeholder
-import net.schueller.peertube.R
-import net.schueller.peertube.common.Constants
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.presentation.common.getCreatorAvatar
-import net.schueller.peertube.feature_video.presentation.common.getCreatorString
-import net.schueller.peertube.feature_video.presentation.common.getMetaDataTag
-import net.schueller.peertube.feature_video.presentation.video_play.VideoPlayEvent
-import net.schueller.peertube.feature_video.presentation.video_play.VideoPlayViewModel
-
-@ExperimentalCoilApi
-@Composable
-fun VideoMeta(
-    video: Video,
-    viewModel: VideoPlayViewModel = hiltViewModel()
-) {
-    
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(
-                color = MaterialTheme.colors.background
-            )
-    ) {
-        Row(
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable(
-                    onClick = {
-                        viewModel.onEvent(VideoPlayEvent.OpenDescription(video))
-                    },
-                )
-        ) {
-            Text(
-                modifier = Modifier.padding(6.dp),
-                text = video.name ?: "",
-//            fontSize = 12.sp,
-                fontWeight = FontWeight.Bold,
-                style = MaterialTheme.typography.h6
-            )
-            Icon(
-                painterResource(id = R.drawable.ic_chevron_down),
-                modifier = Modifier
-                    .size(32.dp)
-                    .padding(end = 6.dp),
-//                    .padding(end = 12.dp),
-                contentDescription = "Open Description"
-            )
-        }
-        Text(
-            modifier = Modifier.padding(start = 6.dp, end = 6.dp),
-            text =  getMetaDataTag(video.createdAt, video.views, "",true),
-            fontWeight = FontWeight.Normal,
-            style = MaterialTheme.typography.caption
-        )
-
-        VideoActions(video)
-
-        Spacer(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(5.dp)
-                .padding(
-                    top = 2.dp,
-                    bottom = 2.dp
-                )
-                .background(MaterialTheme.colors.onBackground)
-        )
-        
-        Row(
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-//                .padding(end = 12.dp)
-        ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .height(56.dp),
-            ) {
-                val avatar = rememberImagePainter(
-                    data = Constants.BASE_IMAGE_URL + getCreatorAvatar(video)?.path
-                )
-                Image(
-                    painter = avatar,
-                    contentDescription = null,
-                    modifier = Modifier
-                        .height(48.dp)
-                        .width(48.dp)
-                        .padding(8.dp)
-                        .clip(shape = CircleShape)
-                        .placeholder(
-                            visible = (avatar.state is ImagePainter.State.Error || avatar.state is ImagePainter.State.Empty),
-                            highlight = if (avatar.state is ImagePainter.State.Empty) {
-                                PlaceholderHighlight.fade()
-                            } else {
-                                null
-                            },
-                        ),
-//                    contentScale = ContentScale.Crop
-                )
-                Column(
-//                    modifier = Modifier
-//                        .padding(8.dp),
-                )
-                {
-                    Text(
-                        text = video.channel?.name ?: video.account?.name ?: "",
-                        fontWeight = FontWeight.Normal,
-                        style = MaterialTheme.typography.subtitle1
-                    )
-                    Text(
-                        text = getCreatorString(video, true),
-                        fontWeight = FontWeight.Normal,
-                        style = MaterialTheme.typography.caption
-                    )
-                }
-            }
-            Text(
-                modifier = Modifier
-                    .padding(end = 16.dp),
-                text =  "SUBSCRIBE",
-                fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colors.primary,
-                style = MaterialTheme.typography.button
-            )
-        }
-
-        Spacer(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(5.dp)
-                .padding(
-                    top = 2.dp,
-                    bottom = 2.dp
-                )
-                .background(MaterialTheme.colors.onBackground)
-        )
-        
-    }
-    
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoScreen.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoScreen.kt
deleted file mode 100644
index c1c969d..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/components/VideoScreen.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.components
-
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.viewinterop.AndroidView
-import com.google.android.exoplayer2.ui.PlayerView
-import net.schueller.peertube.feature_video.domain.model.Video
-import net.schueller.peertube.feature_video.presentation.video_play.player.ExoPlayerHolder
-import android.widget.FrameLayout
-import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.detectDragGestures
-import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
-import androidx.compose.material.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.pointer.consumeAllChanges
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-import net.schueller.peertube.feature_video.presentation.video_play.player.PlayerViewPool
-
-@Composable
-fun VideoScreen(
-    exoPlayerHolder: ExoPlayerHolder,
-    video: Video
-) {
-    val context = LocalContext.current
-    val player = exoPlayerHolder.setVideo(video, context)
-
-    AndroidView(
-        modifier = Modifier
-            .fillMaxWidth(),
-
-
-//                modifier = Modifier.aspectRatio(video.width.toFloat() / video.height.toFloat()),
-        factory = { context ->
-            val frameLayout = FrameLayout(context)
-//                    frameLayout.setBackgroundColor(context.getColor(android.R.color.holo_blue_bright))
-            frameLayout
-        },
-        update = { frameLayout ->
-            frameLayout.removeAllViews()
-
-                val playerView = PlayerViewPool.get(frameLayout.context)
-                playerView.player = player
-
-                PlayerView.switchTargetView(
-                    player,
-                    PlayerViewPool.currentPlayerView,
-                    playerView
-                )
-                PlayerViewPool.currentPlayerView = playerView
-                frameLayout.addView(
-                    playerView,
-                    FrameLayout.LayoutParams.MATCH_PARENT,
-                    FrameLayout.LayoutParams.MATCH_PARENT
-                )
-
-        }
-    )
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/CacheHolder.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/CacheHolder.kt
deleted file mode 100644
index ec62059..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/CacheHolder.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.player
-
-import android.content.Context
-import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
-import com.google.android.exoplayer2.upstream.cache.SimpleCache
-
-object CacheHolder {
-    private var cache: SimpleCache? = null
-    private val lock = Object()
-
-    fun get(context: Context): SimpleCache {
-        synchronized(lock) {
-            if (cache == null) {
-                val cacheSize = 20L * 1024 * 1024
-                val exoDatabaseProvider = StandaloneDatabaseProvider(context)
-
-                cache = SimpleCache(
-                    context.cacheDir,
-                    LeastRecentlyUsedCacheEvictor(cacheSize),
-                    exoDatabaseProvider
-                )
-            }
-        }
-        return cache!!
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/DataSourceHolder.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/DataSourceHolder.kt
deleted file mode 100644
index d803913..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/DataSourceHolder.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.player
-
-import android.content.Context
-import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.upstream.FileDataSource
-import com.google.android.exoplayer2.upstream.cache.CacheDataSink
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource
-import com.google.android.exoplayer2.util.Util
-
-object DataSourceHolder {
-    private var cacheDataSourceFactory: CacheDataSource.Factory? = null
-    private var defaultDataSourceFactory: DataSource.Factory? = null
-
-    fun getCacheFactory(context: Context): CacheDataSource.Factory {
-        if (cacheDataSourceFactory == null) {
-            val simpleCache = CacheHolder.get(context)
-            val defaultFactory = getDefaultFactory(context)
-            cacheDataSourceFactory = CacheDataSource.Factory()
-                .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(defaultFactory)
-                .setCacheReadDataSourceFactory(FileDataSource.Factory())
-                .setCacheWriteDataSinkFactory(
-                    CacheDataSink.Factory()
-                        .setCache(simpleCache)
-                        .setFragmentSize(CacheDataSink.DEFAULT_FRAGMENT_SIZE)
-                )
-        }
-
-        return cacheDataSourceFactory!!
-    }
-
-    private fun getDefaultFactory(context: Context): DataSource.Factory {
-        if (defaultDataSourceFactory == null) {
-            defaultDataSourceFactory = DefaultDataSourceFactory(
-                context,
-                Util.getUserAgent(context, context.packageName)
-            )
-        }
-        return defaultDataSourceFactory!!
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/ExoPlayerHolder.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/ExoPlayerHolder.kt
deleted file mode 100644
index 7d723ad..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/ExoPlayerHolder.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.player
-
-import android.content.Context
-import android.net.Uri
-import androidx.compose.runtime.LaunchedEffect
-import com.google.android.exoplayer2.*
-import com.google.android.exoplayer2.source.ProgressiveMediaSource
-import com.google.android.exoplayer2.source.dash.DashMediaSource
-import com.google.android.exoplayer2.source.hls.HlsMediaSource
-import com.google.android.exoplayer2.util.Util
-import net.schueller.peertube.common.VideoHelper
-import net.schueller.peertube.feature_video.domain.model.Video
-import javax.inject.Singleton
-
-@Singleton
-object ExoPlayerHolder {
-    private var exoplayer: ExoPlayer? = null
-    private var currentVideo: Video? = null
-    private val videoHelper = VideoHelper()
-
-    fun setVideo(video: Video, context: Context): ExoPlayer {
-
-        if (exoplayer == null) {
-            exoplayer = createExoPlayer(context)
-        }
-
-        // check if its the same video
-        if (currentVideo === null || currentVideo?.uuid !== video.uuid) {
-
-            val videoUri = Uri.parse(videoHelper.pickPlaybackResolution(video))
-            val dataSourceFactory = DataSourceHolder.getCacheFactory(context)
-            val source = when (Util.inferContentType(videoUri)) {
-                C.TYPE_DASH -> DashMediaSource.Factory(dataSourceFactory)
-                    .createMediaSource(MediaItem.fromUri(videoUri))
-                C.TYPE_HLS -> HlsMediaSource.Factory(dataSourceFactory)
-                    .createMediaSource(MediaItem.fromUri(videoUri))
-                else -> ProgressiveMediaSource.Factory(dataSourceFactory)
-                    .createMediaSource(MediaItem.fromUri(videoUri))
-            }
-            exoplayer!!.setMediaSource(source)
-            exoplayer!!.prepare()
-            exoplayer!!.playWhenReady = true
-
-            currentVideo = video
-        }
-
-        return exoplayer!!
-    }
-
-    private fun createExoPlayer(context: Context): ExoPlayer {
-        return ExoPlayer.Builder(context)
-            .setLoadControl(
-                DefaultLoadControl.Builder().setBufferDurationsMs(
-                    DefaultLoadControl.DEFAULT_MIN_BUFFER_MS,
-                    DefaultLoadControl.DEFAULT_MAX_BUFFER_MS,
-                    DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS / 10,
-                    DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS / 10
-                ).build()
-            )
-            .build()
-            .apply {
-                repeatMode = Player.REPEAT_MODE_ONE
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/PlayerViewPool.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/PlayerViewPool.kt
deleted file mode 100644
index 729f257..0000000
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video_play/player/PlayerViewPool.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.schueller.peertube.feature_video.presentation.video_play.player
-
-import android.content.Context
-import android.view.LayoutInflater
-import androidx.core.util.Pools
-import com.google.android.exoplayer2.ui.PlayerView
-import net.schueller.peertube.R
-
-object PlayerViewPool {
-    var currentPlayerView: PlayerView? = null
-
-    private val playerViewPool = Pools.SimplePool<PlayerView>(2)
-
-    fun get(context: Context): PlayerView {
-        return playerViewPool.acquire() ?: createPlayerView(context)
-    }
-
-    fun release(player: PlayerView) {
-        playerViewPool.release(player)
-    }
-
-    private fun createPlayerView(context: Context): PlayerView {
-        return (LayoutInflater.from(context).inflate(R.layout.exoplayer_texture_view, null, false) as PlayerView)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/fragment/AddServerFragment.kt b/app/src/main/java/net/schueller/peertube/fragment/AddServerFragment.kt
deleted file mode 100644
index 40886fd..0000000
--- a/app/src/main/java/net/schueller/peertube/fragment/AddServerFragment.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.fragment
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.util.Patterns
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import net.schueller.peertube.R
-import net.schueller.peertube.activity.SearchServerActivity
-import net.schueller.peertube.database.Server
-import net.schueller.peertube.database.ServerViewModel
-import net.schueller.peertube.databinding.FragmentAddServerBinding
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.utils.hideKeyboard
-
-class AddServerFragment : Fragment() {
-
-
-    private lateinit var mBinding: FragmentAddServerBinding
-
-    private val mServerViewModel: ServerViewModel by activityViewModels()
-
-    private var mServer: Server? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            mServer = it.getParcelable(SERVER_ARG)
-        }
-    }
-
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        mBinding = FragmentAddServerBinding.inflate(inflater, container, false)
-        return mBinding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        initServerEdit()
-
-        mBinding.addServerButton.setOnClickListener {
-            var formValid = true
-
-            hideKeyboard()
-
-            if (mBinding.serverLabel.text.toString().isBlank()) {
-                mBinding.serverLabel.error = getString(R.string.server_book_label_is_required)
-                Toast.makeText(context, R.string.invalid_url, Toast.LENGTH_LONG).show()
-                formValid = false
-            }
-
-            // validate url
-            mBinding.serverUrl.apply {
-                APIUrlHelper.cleanServerUrl(text.toString())?.let {
-
-                    setText(it)
-
-                    if (!Patterns.WEB_URL.matcher(it).matches()) {
-                        error = getString(R.string.server_book_valid_url_is_required)
-                        Toast.makeText(context, R.string.invalid_url, Toast.LENGTH_LONG).show()
-                        formValid = false
-                    }
-                }
-            }
-
-
-            if (formValid) {
-                mServer?.apply {
-                    mBinding.let {
-                        serverName = it.serverLabel.text.toString()
-                        serverHost = it.serverUrl.text.toString()
-                        username = it.serverUsername.text.toString()
-                        password = it.serverPassword.text.toString()
-
-                        mServerViewModel.update(this)
-                    }
-                    return@setOnClickListener
-                }
-
-                mBinding.apply {
-                    val server = Server(serverName = serverLabel.text.toString())
-
-                    server.serverHost = serverUrl.text.toString()
-                    server.username = serverUsername.text.toString()
-                    server.password = serverPassword.text.toString()
-
-                    mServerViewModel.insert(server)
-                }
-            }
-        }
-
-        mBinding.pickServerUrl.setOnClickListener {
-            val intentServer = Intent(activity, SearchServerActivity::class.java)
-            openActivityForResult(intentServer)
-        }
-    }
-
-    private fun initServerEdit() {
-        mServer?.let {
-            mBinding.apply {
-                serverLabel.setText(it.serverName)
-                serverUrl.setText(it.serverHost)
-                serverUsername.setText(it.username)
-                serverPassword.setText(it.password)
-
-                addServerButton.text = getString(R.string.server_book_add_save_button)
-            }
-        }
-    }
-
-    private var resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-        if (result.resultCode == Activity.RESULT_OK) {
-            val intent = result.data
-            val serverUrlTest = intent?.getStringExtra("serverUrl")
-            mBinding.serverUrl.setText(serverUrlTest)
-            mBinding.serverLabel.apply {
-                if (text.toString().isBlank()) {
-                    setText(intent?.getStringExtra("serverName"))
-                }
-            }
-        }
-    }
-
-    private fun openActivityForResult(intent: Intent) {
-        resultLauncher.launch(intent)
-    }
-
-    companion object {
-        private const val SERVER_ARG = "server"
-
-        fun newInstance(server: Server) = AddServerFragment().apply {
-            arguments = Bundle().also {
-                it.putParcelable(SERVER_ARG, server)
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoDescriptionFragment.kt b/app/src/main/java/net/schueller/peertube/fragment/VideoDescriptionFragment.kt
deleted file mode 100644
index 7eaa58f..0000000
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoDescriptionFragment.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.fragment
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.widget.ImageButton
-import net.schueller.peertube.R
-import android.widget.TextView
-import androidx.fragment.app.Fragment
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.helper.ErrorHelper
-import net.schueller.peertube.model.Description
-import net.schueller.peertube.model.Video
-import net.schueller.peertube.network.GetVideoDataService
-import net.schueller.peertube.network.RetrofitInstance
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class VideoDescriptionFragment : Fragment () {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val view = inflater.inflate(
-            R.layout.fragment_video_description, container,
-            false
-        )
-
-        val video = video
-
-        if (video != null) {
-
-            val apiBaseURL = APIUrlHelper.getUrlWithVersion(context)
-            val videoDataService = RetrofitInstance.getRetrofitInstance(
-                apiBaseURL,
-                APIUrlHelper.useInsecureConnection(context)
-            ).create(
-                GetVideoDataService::class.java
-            )
-
-            // description, get extended if available
-            val videoDescription = view.findViewById<TextView>(R.id.description)
-            val shortDescription = video.description
-            if (shortDescription != null && shortDescription.length > 237) {
-                val call = videoDataService.getVideoFullDescription(video.uuid);
-                call.enqueue(object : Callback<Description?> {
-                    override fun onResponse(call: Call<Description?>, response: Response<Description?>) {
-                        val videoFullDescription: Description? = response.body();
-
-                        videoDescription.text = videoFullDescription?.description
-                    }
-                    override fun onFailure(call: Call<Description?>, t: Throwable) {
-                        Log.wtf(TAG, t.fillInStackTrace())
-                        ErrorHelper.showToastFromCommunicationError(activity, t)
-                    }
-                })
-            }
-            videoDescription.text = shortDescription;
-
-            val closeButton = view.findViewById<ImageButton>(R.id.video_description_close_button)
-            closeButton.setOnClickListener {
-                videoMetaDataFragment!!.hideDescriptionFragment()
-            }
-
-            // video privacy
-            val videoPrivacy = view.findViewById<TextView>(R.id.video_privacy);
-            videoPrivacy.text = video!!.privacy.label;
-
-            // video category
-            val videoCategory = view.findViewById<TextView>(R.id.video_category);
-            videoCategory.text = video!!.category.label;
-
-            // video privacy
-            val videoLicense = view.findViewById<TextView>(R.id.video_license);
-            videoLicense.text = video!!.licence.label;
-
-            // video language
-            val videoLanguage = view.findViewById<TextView>(R.id.video_language);
-            videoLanguage.text = video!!.language.label;
-
-            // video privacy
-            val videoTags = view.findViewById<TextView>(R.id.video_tags);
-            videoTags.text = android.text.TextUtils.join(", ", video!!.tags);
-        }
-
-
-        return view
-    }
-
-    companion object {
-        private var video: Video? = null
-        private var videoMetaDataFragment: VideoMetaDataFragment? = null
-        const val TAG = "VideoDescr"
-        fun newInstance(mVideo: Video?, mVideoMetaDataFragment: VideoMetaDataFragment): VideoDescriptionFragment {
-            video = mVideo
-            videoMetaDataFragment = mVideoMetaDataFragment
-            return VideoDescriptionFragment()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoMenuQualityFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoMenuQualityFragment.java
deleted file mode 100644
index 04c5485..0000000
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoMenuQualityFragment.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.fragment;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.mikepenz.iconics.Iconics;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.model.File;
-import net.schueller.peertube.model.Resolution;
-
-import java.util.ArrayList;
-
-import androidx.annotation.Nullable;
-
-public class VideoMenuQualityFragment extends BottomSheetDialogFragment {
-
-    private static ArrayList<File> mFiles;
-    public static final String TAG = "VideoMenuQuality";
-    private static File autoQualityFile;
-
-    public static VideoMenuQualityFragment newInstance(Context context, ArrayList<File> files) {
-
-        mFiles = files;
-
-        // Auto quality
-        if (autoQualityFile == null) {
-            autoQualityFile = new File();
-            Resolution autoQualityResolution = new Resolution();
-            autoQualityResolution.setId(999999);
-            autoQualityResolution.setLabel(context.getString(R.string.menu_video_options_quality_automated));
-            autoQualityFile.setId(999999);
-            autoQualityFile.setResolution(autoQualityResolution);
-        }
-        if (!mFiles.contains(autoQualityFile)) {
-            mFiles.add(0, autoQualityFile);
-        }
-
-        return new VideoMenuQualityFragment();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        View view = inflater.inflate(R.layout.fragment_video_options_quality_popup_menu, container,
-                false);
-
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
-        Integer videoQuality = sharedPref.getInt(getString(R.string.pref_quality_key), 999999);
-
-        for (File file : mFiles) {
-
-            LinearLayout menuRow = (LinearLayout) inflater.inflate(R.layout.row_popup_menu, container);
-
-            TextView iconView = menuRow.findViewById(R.id.video_quality_icon);
-            iconView.setId(file.getResolution().getId());
-            TextView textView = menuRow.findViewById(R.id.video_quality_text);
-
-            Log.v(TAG, file.getResolution().getLabel());
-            textView.setText(file.getResolution().getLabel());
-
-            textView.setOnClickListener(view1 -> {
-//                Log.v(TAG, file.getResolution().getLabel());
-                SharedPreferences.Editor editor = sharedPref.edit();
-                editor.putInt(getString(R.string.pref_quality_key), file.getResolution().getId());
-                editor.apply();
-
-                for (File fileV : mFiles) {
-                    TextView iconViewV = view.findViewById(fileV.getResolution().getId());
-                    if (iconViewV != null) {
-                        iconViewV.setText("");
-                    }
-                }
-
-                iconView.setText(R.string.video_quality_active_icon);
-                new Iconics.Builder().on(iconView).build();
-
-                //TODO: set new video quality on running video
-
-            });
-
-            // Add to menu
-            LinearLayout menuHolder = view.findViewById(R.id.video_quality_menu);
-            menuHolder.addView(menuRow);
-
-            // Set current
-            if (videoQuality.equals(file.getResolution().getId())) {
-                iconView.setText(R.string.video_quality_active_icon);
-                new Iconics.Builder().on(iconView).build();
-            }
-
-        }
-
-        return view;
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoMenuSpeedFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoMenuSpeedFragment.java
deleted file mode 100644
index 1fc333f..0000000
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoMenuSpeedFragment.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.fragment;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.mikepenz.iconics.Iconics;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.service.VideoPlayerService;
-
-import androidx.annotation.Nullable;
-
-public class VideoMenuSpeedFragment extends BottomSheetDialogFragment {
-
-    private static VideoPlayerService videoPlayerService;
-    public static final String TAG = "VideoMenuSpeed";
-
-    private TextView speed05Icon;
-    private TextView speed075Icon;
-    private TextView speed10Icon;
-    private TextView speed125Icon;
-    private TextView speed15Icon;
-    private TextView speed20Icon;
-
-    public static VideoMenuSpeedFragment newInstance(VideoPlayerService mService) {
-        videoPlayerService = mService;
-        return new VideoMenuSpeedFragment();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        View view = inflater.inflate(R.layout.fragment_video_options_speed_popup_menu, container,
-                false);
-
-        // Icons
-        speed05Icon = view.findViewById(R.id.video_speed05_icon);
-        speed075Icon = view.findViewById(R.id.video_speed075_icon);
-        speed10Icon = view.findViewById(R.id.video_speed10_icon);
-        speed125Icon = view.findViewById(R.id.video_speed125_icon);
-        speed15Icon = view.findViewById(R.id.video_speed15_icon);
-        speed20Icon = view.findViewById(R.id.video_speed20_icon);
-
-        // Buttons
-        TextView speed05 = view.findViewById(R.id.video_speed05);
-        TextView speed075 = view.findViewById(R.id.video_speed075);
-        TextView speed10 = view.findViewById(R.id.video_speed10);
-        TextView speed125 = view.findViewById(R.id.video_speed125);
-        TextView speed15 = view.findViewById(R.id.video_speed15);
-        TextView speed20 = view.findViewById(R.id.video_speed20);
-
-        setDefaultVideoSpeed();
-
-        // Attach the listener
-        speed05.setOnClickListener(v -> setVideoSpeed(0.5f, speed05Icon));
-        speed075.setOnClickListener(v -> setVideoSpeed(0.75f, speed075Icon));
-        speed10.setOnClickListener(v -> setVideoSpeed(1.0f, speed10Icon));
-        speed125.setOnClickListener(v -> setVideoSpeed(1.25f, speed125Icon));
-        speed15.setOnClickListener(v -> setVideoSpeed(1.5f, speed15Icon));
-        speed20.setOnClickListener(v -> setVideoSpeed(2.0f, speed20Icon));
-
-        return view;
-
-    }
-
-
-    private void setVideoSpeed(Float speed, TextView icon) {
-
-        speed05Icon.setText("");
-        speed075Icon.setText("");
-        speed10Icon.setText("");
-        speed125Icon.setText("");
-        speed15Icon.setText("");
-        speed20Icon.setText("");
-
-        videoPlayerService.setPlayBackSpeed(speed);
-
-        icon.setText(R.string.video_speed_active_icon);
-        new Iconics.Builder().on(icon).build();
-    }
-
-    private void setDefaultVideoSpeed() {
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
-        String speed = sharedPref.getString(getString(R.string.pref_video_speed_key), "1.0");
-
-        switch (speed) {
-            case "0.5":
-                setVideoSpeed(0.5f, speed05Icon);
-                break;
-            case "0.75":
-                setVideoSpeed(0.75f, speed075Icon);
-                break;
-            case "1.0":
-                setVideoSpeed(1.0f, speed10Icon);
-                break;
-            case "1.25":
-                setVideoSpeed(1.25f, speed125Icon);
-                break;
-            case "1.5":
-                setVideoSpeed(1.5f, speed15Icon);
-                break;
-            case "2.0":
-                setVideoSpeed(2.0f, speed20Icon);
-                break;
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.kt b/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.kt
deleted file mode 100644
index 746b4fd..0000000
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.kt
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.fragment
-
-import android.app.Activity
-import android.content.Context
-import android.content.res.ColorStateList
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.mikepenz.iconics.Iconics
-import net.schueller.peertube.R
-import net.schueller.peertube.adapter.MultiViewRecycleViewAdapter
-import net.schueller.peertube.database.VideoViewModel
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.helper.ErrorHelper
-import net.schueller.peertube.model.CommentThread
-import net.schueller.peertube.model.Rating
-import net.schueller.peertube.model.Video
-import net.schueller.peertube.model.VideoList
-import net.schueller.peertube.model.ui.VideoMetaViewItem
-import net.schueller.peertube.network.GetVideoDataService
-import net.schueller.peertube.network.RetrofitInstance
-import net.schueller.peertube.service.VideoPlayerService
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class VideoMetaDataFragment : Fragment() {
-    private var videoRating: Rating? = null
-    private var defaultTextColor: ColorStateList? = null
-    private var recyclerView: RecyclerView? = null
-    private var mMultiViewAdapter: MultiViewRecycleViewAdapter? = null
-
-    private lateinit var videoDescriptionFragment: VideoDescriptionFragment
-
-    private val mVideoViewModel: VideoViewModel by activityViewModels()
-
-    var isLeaveAppExpected = false
-        private set
-
-    override fun onCreateView(
-            inflater: LayoutInflater, container: ViewGroup?,
-            savedInstanceState: Bundle?
-    ): View? {
-
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_video_meta, container, false)
-    }
-
-    override fun onPause() {
-        isLeaveAppExpected = false
-        super.onPause()
-    }
-
-    fun showDescriptionFragment(video: Video) {
-        // show full description fragment
-        videoDescriptionFragment = VideoDescriptionFragment.newInstance(video, this)
-        childFragmentManager.beginTransaction()
-                .add(R.id.video_meta_data_fragment, videoDescriptionFragment, VideoDescriptionFragment.TAG).commit()
-    }
-
-    fun hideDescriptionFragment() {
-        val fragment: Fragment? = childFragmentManager.findFragmentByTag(VideoDescriptionFragment.TAG)
-        if (fragment != null) {
-            childFragmentManager.beginTransaction().remove(fragment).commit()
-        }
-    }
-
-    fun updateVideoMeta(video: Video, mService: VideoPlayerService?) {
-
-        // Remove description if it is open as we are loading a new video
-        hideDescriptionFragment()
-
-        val context = context
-        val activity: Activity? = activity
-        val apiBaseURL = APIUrlHelper.getUrlWithVersion(context)
-        val videoDataService = RetrofitInstance.getRetrofitInstance(
-                apiBaseURL,
-                APIUrlHelper.useInsecureConnection(context)
-        ).create(
-                GetVideoDataService::class.java
-        )
-
-        // related videos
-        recyclerView = activity!!.findViewById(R.id.relatedVideosView)
-        val layoutManager: RecyclerView.LayoutManager = LinearLayoutManager(this@VideoMetaDataFragment.context)
-        recyclerView?.layoutManager = layoutManager
-        mMultiViewAdapter = MultiViewRecycleViewAdapter(this)
-        recyclerView?.adapter = mMultiViewAdapter
-
-        val videoMetaViewItem = VideoMetaViewItem()
-        videoMetaViewItem.video = video
-        mMultiViewAdapter?.setVideoMeta(videoMetaViewItem)
-
-        loadVideos()
-
-//        loadComments(video.id)
-
-//        mMultiViewAdapter?.setVideoComment()
-
-        // videoOwnerSubscribeButton
-
-
-        // description
-
-
-        // video player options
-        val videoOptions = activity.findViewById<TextView>(R.id.exo_more)
-        videoOptions.setText(R.string.video_more_icon)
-        Iconics.Builder().on(videoOptions).build()
-        videoOptions.setOnClickListener {
-            val videoOptionsFragment = VideoOptionsFragment.newInstance(mService, video.files)
-            videoOptionsFragment.show(
-                    getActivity()!!.supportFragmentManager,
-                    VideoOptionsFragment.TAG
-            )
-        }
-    }
-
-    private fun loadComments(videoId: Int) {
-        val context = context
-
-        val start = 0
-        val count = 1
-        val sort = "-createdAt"
-
-
-        // We set this to default to null so that on initial start there are videos listed.
-        val apiBaseURL = APIUrlHelper.getUrlWithVersion(context)
-        val service =
-                RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(
-                        GetVideoDataService::class.java
-                )
-        val call: Call<CommentThread> = service.getCommentThreads(videoId, start, count, sort)
-
-        call.enqueue(object : Callback<CommentThread?> {
-            override fun onResponse(call: Call<CommentThread?>, response: Response<CommentThread?>) {
-                if (response.body() != null) {
-                    val commentThread = response.body()
-                    if (commentThread != null) {
-                        mMultiViewAdapter!!.setVideoComment(commentThread)
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<CommentThread?>, t: Throwable) {
-                Log.wtf("err", t.fillInStackTrace())
-                ErrorHelper.showToastFromCommunicationError(this@VideoMetaDataFragment.context, t)
-            }
-        })
-    }
-
-    private fun loadVideos() {
-        val context = context
-
-        val start = 0
-        val count = 6
-        val sort = "-createdAt"
-        val filter: String? = null
-
-        val sharedPref = context?.getSharedPreferences(
-                context.packageName + "_preferences",
-                Context.MODE_PRIVATE
-        )
-
-        var nsfw = "false"
-        var languages: Set<String>? = emptySet()
-        if (sharedPref != null) {
-            nsfw = if (sharedPref.getBoolean(getString(R.string.pref_show_nsfw_key), false)) "both" else "false"
-            languages = sharedPref.getStringSet(getString(R.string.pref_video_language_key), null)
-        }
-
-        // We set this to default to null so that on initial start there are videos listed.
-        val apiBaseURL = APIUrlHelper.getUrlWithVersion(context)
-        val service =
-                RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(
-                        GetVideoDataService::class.java
-                )
-        val call: Call<VideoList> = service.getVideosData(start, count, sort, nsfw, filter, languages)
-
-        /*Log the URL called*/Log.d("URL Called", call.request().url.toString() + "")
-        //        Toast.makeText(VideoListActivity.this, "URL Called: " + call.request().url(), Toast.LENGTH_SHORT).show();
-        call.enqueue(object : Callback<VideoList?> {
-            override fun onResponse(call: Call<VideoList?>, response: Response<VideoList?>) {
-                if (response.body() != null) {
-                    val videoList = response.body()
-                    if (videoList != null) {
-                        mMultiViewAdapter!!.setVideoListData(videoList)
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<VideoList?>, t: Throwable) {
-                Log.wtf("err", t.fillInStackTrace())
-                ErrorHelper.showToastFromCommunicationError(this@VideoMetaDataFragment.context, t)
-            }
-        })
-    }
-
-    fun saveToPlaylist(video: Video) {
-        val playlistVideo: net.schueller.peertube.database.Video = net.schueller.peertube.database.Video(videoUUID = video.uuid, videoName = video.name, videoDescription = video.description)
-        mVideoViewModel.insert(playlistVideo)
-    }
-
-    companion object {
-        const val TAG = "VMDF"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java
deleted file mode 100644
index 3914d34..0000000
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.fragment;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.mikepenz.iconics.Iconics;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.model.File;
-import net.schueller.peertube.service.VideoPlayerService;
-
-import java.util.ArrayList;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-
-public class VideoOptionsFragment extends BottomSheetDialogFragment {
-
-    private static VideoPlayerService videoPlayerService;
-    private static ArrayList<File> files;
-
-    public static final String TAG = "VideoOptions";
-
-
-    public static VideoOptionsFragment newInstance(VideoPlayerService mService, ArrayList<File> mFiles) {
-        videoPlayerService = mService;
-        files = mFiles;
-        return new VideoOptionsFragment();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        View view = inflater.inflate(R.layout.fragment_video_options_popup_menu, container,
-                false);
-
-        LinearLayout menuHolder = view.findViewById(R.id.video_options_popup);
-
-        // Video Speed
-        LinearLayout menuRow = (LinearLayout) inflater.inflate(R.layout.row_popup_menu, container);
-        TextView iconView = menuRow.findViewById(R.id.video_quality_icon);
-        TextView textView = menuRow.findViewById(R.id.video_quality_text);
-
-        textView.setText(
-                getString(
-                        R.string.menu_video_options_playback_speed,
-                        getCurrentVideoPlaybackSpeedString(videoPlayerService.getPlayBackSpeed()
-                        )
-                )
-        );
-
-
-        iconView.setText(R.string.video_option_speed_icon);
-        new Iconics.Builder().on(iconView).build();
-        textView.setOnClickListener(view1 -> {
-            VideoMenuSpeedFragment videoMenuSpeedFragment =
-                    VideoMenuSpeedFragment.newInstance(videoPlayerService);
-            videoMenuSpeedFragment.show(requireActivity().getSupportFragmentManager(),
-                    VideoMenuSpeedFragment.TAG);
-        });
-        menuHolder.addView(menuRow);
-
-        // Video Quality
-        LinearLayout menuRow2 = (LinearLayout) inflater.inflate(R.layout.row_popup_menu, container);
-        TextView iconView2 = menuRow2.findViewById(R.id.video_quality_icon);
-        TextView textView2 = menuRow2.findViewById(R.id.video_quality_text);
-        textView2.setText(String.format(getString(R.string.menu_video_options_quality), getCurrentVideoQuality(files)));
-        iconView2.setText(R.string.video_option_quality_icon);
-        new Iconics.Builder().on(iconView2).build();
-        textView2.setOnClickListener(view1 -> {
-            VideoMenuQualityFragment videoMenuQualityFragment =
-                    VideoMenuQualityFragment.newInstance(getContext(), files);
-            videoMenuQualityFragment.show(requireActivity().getSupportFragmentManager(),
-                    VideoMenuQualityFragment.TAG);
-        });
-        menuHolder.addView(menuRow2);
-
-        return view;
-
-    }
-
-    private String getCurrentVideoQuality(ArrayList<File> files) {
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
-        Integer videoQuality = sharedPref.getInt(getString(R.string.pref_quality_key), 999999);
-
-        for (File file : files) {
-            if (videoQuality.equals(file.getResolution().getId())) {
-                return file.getResolution().getLabel();
-            }
-        }
-        // Returning Automated as a placeholder
-        return getString(R.string.menu_video_options_quality_automated);
-    }
-
-    private String getCurrentVideoPlaybackSpeedString(float playbackSpeed) {
-        String speed = String.valueOf(playbackSpeed);
-        // Remove all non-digit characters from the string
-        speed = speed.replaceAll("[^0-9]", "");
-
-        // Dynamically get the localized string corresponding to the speed
-        @StringRes int stringId = getResources().getIdentifier("video_speed_" + speed, "string", videoPlayerService.getPackageName());
-        return getString(stringId);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.kt b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.kt
deleted file mode 100644
index 5fc08f9..0000000
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.kt
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.fragment
-
-import com.google.android.exoplayer2.video.VideoRendererEventListener
-import com.google.android.exoplayer2.ui.PlayerView
-import android.content.Intent
-import net.schueller.peertube.service.VideoPlayerService
-import com.github.se_bastiaan.torrentstream.TorrentStream
-import android.widget.LinearLayout
-import android.view.GestureDetector
-import android.content.ServiceConnection
-import android.content.ComponentName
-import android.os.IBinder
-import net.schueller.peertube.service.VideoPlayerService.LocalBinder
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.AspectRatioListener
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.os.Bundle
-import net.schueller.peertube.R
-import android.app.Activity
-import android.app.PictureInPictureParams
-import android.content.Context
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-import android.widget.TextView
-import android.widget.FrameLayout
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.network.GetVideoDataService
-import net.schueller.peertube.network.RetrofitInstance
-import android.widget.Toast
-import net.schueller.peertube.helper.ErrorHelper
-import android.content.pm.ActivityInfo
-import android.net.Uri
-import android.os.Build
-import com.github.se_bastiaan.torrentstream.listeners.TorrentListener
-import com.github.se_bastiaan.torrentstream.Torrent
-import com.github.se_bastiaan.torrentstream.StreamStatus
-import com.google.android.exoplayer2.decoder.DecoderCounters
-import android.view.View.OnTouchListener
-import android.view.MotionEvent
-import android.view.GestureDetector.SimpleOnGestureListener
-import androidx.annotation.RequiresApi
-import android.os.Build.VERSION_CODES
-import android.os.Environment
-import android.util.Log
-import android.view.View
-import android.widget.ProgressBar
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
-import androidx.fragment.app.Fragment
-import com.github.se_bastiaan.torrentstream.TorrentOptions.Builder
-import com.google.android.exoplayer2.Format
-import com.google.android.exoplayer2.util.Util
-import com.mikepenz.iconics.Iconics
-import net.schueller.peertube.R.layout
-import net.schueller.peertube.R.string
-import net.schueller.peertube.helper.VideoHelper
-import net.schueller.peertube.model.Video
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.lang.Exception
-import kotlin.math.abs
-
-class VideoPlayerFragment : Fragment(), VideoRendererEventListener {
-
-    var videoUuid: String? = null
-        private set
-//    private var progressBar: ProgressBar? = null
-    private var exoPlayer: PlayerView? = null
-    private var videoPlayerIntent: Intent? = null
-    private var mBound = false
-    private var isFullscreen = false
-    private var mService: VideoPlayerService? = null
-    private var torrentStream: TorrentStream? = null
-//    private var torrentStatus: LinearLayout? = null
-    var videoAspectRatio = 0f
-        private set
-    private var mDetector: GestureDetector? = null
-    private val mConnection: ServiceConnection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            Log.d(TAG, "onServiceConnected")
-            val binder = service as LocalBinder
-            mService = binder.service
-
-            // 2. Create the player
-            exoPlayer!!.player = mService!!.player
-            mBound = true
-            loadVideo()
-        }
-
-        override fun onServiceDisconnected(componentName: ComponentName) {
-            Log.d(TAG, "onServiceDisconnected")
-            exoPlayer!!.player = null
-            mBound = false
-        }
-    }
-    private val aspectRatioListener: AspectRatioListener = AspectRatioListener {
-            targetAspectRatio, _, _ -> videoAspectRatio = targetAspectRatio
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        // Inflate the layout for this fragment
-        return inflater.inflate(layout.fragment_video_player, container, false)
-    }
-
-    fun start(videoUuid: String?) {
-
-        // start service
-        val context = context
-        val activity: Activity? = activity
-        this.videoUuid = videoUuid
-        assert(activity != null)
-//        progressBar = activity?.findViewById(R.id.torrent_progress)
-//        progressBar?.max = 100
-        assert(context != null)
-        exoPlayer = PlayerView(context!!)
-        exoPlayer = activity?.findViewById(R.id.video_view)
-        exoPlayer?.controllerShowTimeoutMs = 1000
-        exoPlayer?.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT
-        mDetector = GestureDetector(context, MyGestureListener())
-        exoPlayer?.setOnTouchListener(touchListener)
-        exoPlayer?.setAspectRatioListener(aspectRatioListener)
-//        torrentStatus = activity?.findViewById(R.id.exo_torrent_status)
-
-        // Full screen Icon
-        val fullscreenText = activity?.findViewById<TextView>(R.id.exo_fullscreen)
-        val fullscreenButton = activity?.findViewById<FrameLayout>(R.id.exo_fullscreen_button)
-        fullscreenText?.setText(string.video_expand_icon)
-        if (fullscreenText != null) {
-            Iconics.Builder().on(fullscreenText).build()
-            fullscreenButton?.setOnClickListener {
-                Log.d(TAG, "Fullscreen")
-                fullScreenToggle()
-            }
-        }
-        if (!mBound) {
-            videoPlayerIntent = Intent(context, VideoPlayerService::class.java)
-            activity?.bindService(videoPlayerIntent, mConnection, Context.BIND_AUTO_CREATE)
-        }
-    }
-
-    private fun loadVideo() {
-        val context = context
-
-        // get video details from api
-        val apiBaseURL = APIUrlHelper.getUrlWithVersion(context)
-        val service =
-            RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(
-                GetVideoDataService::class.java
-            )
-        val call = service.getVideoData(videoUuid)
-        call.enqueue(object : Callback<Video?> {
-            override fun onResponse(call: Call<Video?>, response: Response<Video?>) {
-                val video = response.body()
-                mService!!.setCurrentVideo(video)
-                if (video == null) {
-                    Toast.makeText(
-                        context,
-                        "Unable to retrieve video information, try again later.",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    return
-                }
-                playVideo(video)
-            }
-
-            override fun onFailure(call: Call<Video?>, t: Throwable) {
-                Log.wtf(TAG, t.fillInStackTrace())
-                ErrorHelper.showToastFromCommunicationError(activity, t)
-            }
-        })
-    }
-
-    fun useController(value: Boolean) {
-        if (mBound) {
-            exoPlayer!!.useController = value
-        }
-    }
-
-    private fun playVideo(video: Video) {
-        val context = context
-
-        // video Meta fragment
-        val videoMetaDataFragment =
-            (requireActivity().supportFragmentManager.findFragmentById(R.id.video_meta_data_fragment) as VideoMetaDataFragment?)!!
-        videoMetaDataFragment.updateVideoMeta(video, mService)
-
-        val sharedPref = context?.getSharedPreferences(
-            context.packageName + "_preferences",
-            Context.MODE_PRIVATE
-        )
-
-        var prefTorrentPlayer = false
-        var videoQuality = 999999
-        if (sharedPref != null) {
-            prefTorrentPlayer = sharedPref.getBoolean(getString(string.pref_torrent_player_key), false)
-            videoQuality = sharedPref.getInt(getString(string.pref_quality_key), 999999)
-        }
-
-//        if (prefTorrentPlayer) {
-//            torrentStatus!!.visibility = View.VISIBLE
-//            val stream = video.files[0].torrentUrl
-//            Log.v(TAG, "getTorrentUrl : " + video.files[0].torrentUrl)
-//            torrentStream = setupTorrentStream()
-//            torrentStream!!.startStream(stream)
-//        } else {
-            var urlToPlay: String? = null
-            var isHLS = false
-
-            // try HLS stream first
-            // get video qualities
-            // TODO: if auto is set all versions except 0p should be added to a track and have exoplayer auto select optimal bitrate
-            if (video.streamingPlaylists.size > 0) {
-                urlToPlay = video.streamingPlaylists[0].playlistUrl
-                isHLS = true
-            } else {
-                if (video.files.size > 0) {
-                    urlToPlay = video.files[0].fileUrl // default, take first found, usually highest res
-                    for (file in video.files) {
-                        // Set quality if it matches
-                        if (file.resolution.id == videoQuality) {
-                            urlToPlay = file.fileUrl
-                        }
-                    }
-                }
-            }
-            if (urlToPlay!!.isNotEmpty()) {
-                mService!!.setCurrentStreamUrl(urlToPlay, isHLS)
-//                torrentStatus!!.visibility = View.GONE
-                startPlayer()
-            } else {
-                stopVideo()
-                Toast.makeText(context, string.api_error, Toast.LENGTH_LONG).show()
-            }
-//        }
-        Log.v(TAG, "end of load Video")
-    }
-
-    private fun startPlayer() {
-        Util.startForegroundService(requireContext(), videoPlayerIntent!!)
-    }
-
-    fun destroyVideo() {
-        exoPlayer!!.player = null
-        if (torrentStream != null) {
-            torrentStream!!.stopStream()
-        }
-    }
-
-    fun pauseVideo() {
-        if (mBound) {
-            mService!!.player!!.playWhenReady = false
-        }
-    }
-
-//    fun pauseToggle() {
-//        if (mBound) {
-//            mService!!.player!!.playWhenReady = !mService!!.player!!.playWhenReady
-//        }
-//    }
-
-    fun unPauseVideo() {
-        if (mBound) {
-            mService!!.player!!.playWhenReady = true
-        }
-    }
-
-    val isPaused: Boolean
-        get() = !mService!!.player!!.playWhenReady
-
-    fun showControls(value: Boolean) {
-        exoPlayer!!.useController = value
-    }
-
-    fun stopVideo() {
-        if (mBound) {
-            requireContext().unbindService(mConnection)
-            mBound = false
-        }
-    }
-
-    /**
-     * triggered rotation and button press
-     */
-    fun setIsFullscreen(fullscreen: Boolean) {
-        isFullscreen = fullscreen
-        val fullscreenButton = requireActivity().findViewById<TextView>(R.id.exo_fullscreen)
-        if (fullscreen) {
-            hideSystemBars()
-            fullscreenButton.setText(string.video_compress_icon)
-        } else {
-            restoreSystemBars()
-            fullscreenButton.setText(string.video_expand_icon)
-        }
-        Iconics.Builder().on(fullscreenButton).build()
-    }
-
-    private fun hideSystemBars()
-    {
-        val view = this.view
-        if (view != null) {
-            val windowInsetsController =
-                ViewCompat.getWindowInsetsController(view) ?: return
-            // Configure the behavior of the hidden system bars
-            windowInsetsController.systemBarsBehavior =
-                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            // Hide both the status bar and the navigation bar
-            windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
-        }
-    }
-
-    private fun restoreSystemBars()
-    {
-        val view = this.view
-        if (view != null) {
-            val windowInsetsController =
-                ViewCompat.getWindowInsetsController(view) ?: return
-            // Show both the status bar and the navigation bar
-            windowInsetsController.show(WindowInsetsCompat.Type.systemBars())
-        }
-    }
-
-    fun getIsFullscreen(): Boolean {
-        return isFullscreen
-    }
-
-    /**
-     * Triggered by button press
-     */
-    fun fullScreenToggle() {
-        if (!isFullscreen) {
-            setIsFullscreen(true)
-            requireActivity().requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-        } else {
-            setIsFullscreen(false)
-            // we want to force portrait if fullscreen is switched of as we do not have a min. landscape view
-            requireActivity().requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-        }
-    }
-//
-//    /**
-//     * Torrent Playback
-//     *
-//     * @return torrent stream
-//     */
-//    private fun setupTorrentStream(): TorrentStream {
-//        val torrentOptions = Builder()
-//            .saveLocation(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS))
-//            .removeFilesAfterStop(true)
-//            .build()
-//        val torrentStream = TorrentStream.init(torrentOptions)
-//        torrentStream.addListener(object : TorrentListener {
-//            override fun onStreamReady(torrent: Torrent) {
-//                val videoPath = Uri.fromFile(torrent.videoFile).toString()
-//                Log.d(TAG, "Ready! torrentStream videoPath:$videoPath")
-//                mService!!.setCurrentStreamUrl(videoPath, false)
-//                startPlayer()
-//            }
-//
-//            override fun onStreamProgress(torrent: Torrent, streamStatus: StreamStatus) {
-//                if (streamStatus.bufferProgress <= 100 && progressBar!!.progress < 100 && progressBar!!.progress != streamStatus.bufferProgress) {
-//                    //Log.d(TAG, "Progress: " + streamStatus.bufferProgress);
-//                    progressBar!!.progress = streamStatus.bufferProgress
-//                }
-//            }
-//
-//            override fun onStreamStopped() {
-//                Log.d(TAG, "Stopped")
-//            }
-//
-//            override fun onStreamPrepared(torrent: Torrent) {
-//                Log.d(TAG, "Prepared")
-//            }
-//
-//            override fun onStreamStarted(torrent: Torrent) {
-//                Log.d(TAG, "Started")
-//            }
-//
-//            override fun onStreamError(torrent: Torrent, e: Exception) {
-//                Log.d(TAG, "Error: " + e.message)
-//            }
-//        })
-//        return torrentStream
-//    }
-
-    override fun onVideoEnabled(counters: DecoderCounters) {
-        Log.v(TAG, "onVideoEnabled()...")
-    }
-
-    override fun onVideoDecoderInitialized(
-        decoderName: String,
-        initializedTimestampMs: Long,
-        initializationDurationMs: Long
-    ) {
-    }
-
-    override fun onVideoInputFormatChanged(format: Format) {}
-    override fun onDroppedFrames(count: Int, elapsedMs: Long) {}
-    override fun onVideoDisabled(counters: DecoderCounters) {
-        Log.v(TAG, "onVideoDisabled()...")
-    }
-
-    // touch event on video player
-    private var touchListener = OnTouchListener { _, event ->
-        //v.performClick() // causes flicker but should be implemented for accessibility
-        mDetector!!.onTouchEvent(event)
-    }
-
-    internal inner class MyGestureListener : SimpleOnGestureListener() {
-
-        /*
-                @Override
-                public boolean onDown(MotionEvent event) {
-                    Log.d("TAG","onDown: ");
-                    return true;
-                }
-
-                @Override
-                public boolean onSingleTapConfirmed(MotionEvent e) {
-                    Log.i("TAG", "onSingleTapConfirmed: ");
-                    pauseToggle();
-                    return true;
-                }
-
-                @Override
-                public void onLongPress(MotionEvent e) {
-                    Log.i("TAG", "onLongPress: ");
-                }
-
-                @Override
-                public boolean onDoubleTap(MotionEvent e) {
-                    Log.i("TAG", "onDoubleTap: ");
-                    return true;
-                }
-
-                @Override
-                public boolean onScroll(MotionEvent e1, MotionEvent e2,
-                                        float distanceX, float distanceY) {
-                    Log.i("TAG", "onScroll: ");
-                    return true;
-                }
-        */
-        @RequiresApi(api = VERSION_CODES.N)
-        override fun onFling(
-            event1: MotionEvent, event2: MotionEvent,
-            velocityX: Float, velocityY: Float
-        ): Boolean {
-            Log.d(TAG, event1.toString())
-            Log.d(TAG, event2.toString())
-            Log.d(TAG, velocityX.toString())
-            Log.d(TAG, velocityY.toString())
-            //arbitrarily velocity speeds that seem to work to differentiate events.
-            if (velocityY > 4000) {
-                Log.d(TAG, "we have a drag down event")
-                if (VideoHelper.canEnterPipMode(context)) {
-                    if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
-                        val pipParams = PictureInPictureParams.Builder()
-                        requireActivity().enterPictureInPictureMode(pipParams.build())
-                    }
-                }
-            }
-            if (velocityX > 2000 && abs(velocityY) < 2000) {
-                Log.d(TAG, "swipe right $velocityY")
-            }
-            if (velocityX < 2000 && abs(velocityY) < 2000) {
-                Log.d(TAG, "swipe left $velocityY")
-            }
-            return true
-        }
-    }
-
-    companion object {
-
-        private const val TAG = "VideoPlayerFragment"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java b/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
deleted file mode 100644
index 368427b..0000000
--- a/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.helper;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.util.Patterns;
-import android.webkit.URLUtil;
-import android.widget.Toast;
-
-import net.schueller.peertube.R;
-
-public class APIUrlHelper{
-
-    public static String getUrl(Context context) {
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
-
-        // validate URL is valid
-        String URL = sharedPref.getString(context.getString(R.string.pref_api_base_key), context.getResources().getString(R.string.pref_default_api_base_url));
-        if (!URLUtil.isValidUrl(URL)) {
-            return "http://invalid";
-        }
-        return URL;
-    }
-
-    public static String getUrlWithVersion(Context context) {
-        return APIUrlHelper.getUrl(context) + "/api/v1/";
-    }
-
-    public static Boolean useInsecureConnection(Context context) {
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
-        return sharedPref.getBoolean(context.getString(R.string.pref_accept_insecure), false);
-    }
-
-    public static String getShareUrl(Context context, String videoUuid) {
-        return APIUrlHelper.getUrl(context) + "/videos/watch/" + videoUuid;
-    }
-
-    public static String getServerIndexUrl(Context context) {
-        return "https://instances.joinpeertube.org/api/v1/";
-    }
-
-    public static String cleanServerUrl(String url) {
-
-        String cleanUrl = url.toLowerCase();
-
-        cleanUrl = cleanUrl.replace(" ", "");
-
-        if (!cleanUrl.startsWith("http")) {
-            cleanUrl = "https://" + cleanUrl;
-        }
-
-        if (cleanUrl.endsWith("/")) {
-            cleanUrl = cleanUrl.substring(0, cleanUrl.length() - 1);
-        }
-
-        return cleanUrl;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/helper/ErrorHelper.java b/app/src/main/java/net/schueller/peertube/helper/ErrorHelper.java
deleted file mode 100644
index e50d701..0000000
--- a/app/src/main/java/net/schueller/peertube/helper/ErrorHelper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.helper;
-
-import android.content.Context;
-import android.widget.Toast;
-
-import net.schueller.peertube.R;
-
-import java.io.IOException;
-
-import retrofit2.HttpException;
-
-public class ErrorHelper {
-
-    public static void showToastFromCommunicationError( Context context, Throwable throwable ) {
-        if (throwable instanceof IOException ) {
-            //handle network error
-            Toast.makeText( context, context.getString( R.string.network_error), Toast.LENGTH_SHORT).show();
-        } else if (throwable instanceof HttpException ) {
-            //handle HTTP error response code
-            Toast.makeText(context, context.getString(R.string.api_error), Toast.LENGTH_SHORT).show();
-        } else {
-            //handle other exceptions
-            Toast.makeText(context, context.getString(R.string.api_error), Toast.LENGTH_SHORT).show();
-        }
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/helper/MetaDataHelper.kt b/app/src/main/java/net/schueller/peertube/helper/MetaDataHelper.kt
deleted file mode 100644
index 1dcaae7..0000000
--- a/app/src/main/java/net/schueller/peertube/helper/MetaDataHelper.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.helper
-
-import android.content.Context
-import android.text.format.DateUtils
-import net.schueller.peertube.R
-import net.schueller.peertube.R.string
-import net.schueller.peertube.model.Account
-import net.schueller.peertube.model.Avatar
-import net.schueller.peertube.model.Video
-import org.ocpsoft.prettytime.PrettyTime
-import java.util.Date
-import java.util.Locale
-import kotlin.math.absoluteValue
-
-object MetaDataHelper {
-
-    @JvmStatic
-    fun getMetaString(getCreatedAt: Date, viewCount: Int, context: Context, reversed: Boolean = false): String {
-
-        // Compatible with SDK 21+
-        val currentLanguage = Locale.getDefault().displayLanguage
-        val p = PrettyTime(currentLanguage)
-        val relativeTime = p.format(Date(getCreatedAt.time))
-        return if (reversed) {
-            viewCount.toString() +
-                    context.resources.getString(string.meta_data_views) +
-                    context.resources.getString(string.meta_data_seperator) +
-                    relativeTime
-        } else {
-            relativeTime +
-                    context.resources.getString(string.meta_data_seperator) +
-                    viewCount + context.resources.getString(string.meta_data_views)
-        }
-    }
-
-    fun getTagsString(video: Video): String {
-        return if (video.tags.isNotEmpty()) {
-            " #" + video.tags.joinToString(" #", "", "", 3, "")
-        } else {
-            " "
-        }
-    }
-
-    @JvmStatic
-    fun getCreatorString(video: Video, context: Context, fqdn: Boolean = false): String {
-        return if (isChannel(video)) {
-            if (!fqdn) {
-                video.channel.displayName
-            } else {
-                getConcatFqdnString(video.channel.name, video.channel.host, context)
-            }
-        } else {
-            getOwnerString(video.account, context, fqdn)
-        }
-    }
-
-    @JvmStatic
-    fun getOwnerString(account: Account, context: Context, fqdn: Boolean = true): String {
-        return  if (!fqdn) {
-            account.name
-        } else {
-            getConcatFqdnString(account.name, account.host, context)
-        }
-    }
-
-    private fun getConcatFqdnString(user: String, host: String, context: Context): String {
-        return context.resources.getString(string.video_owner_fqdn_line, user, host)
-    }
-
-    @JvmStatic
-    fun getCreatorAvatar(video: Video, context: Context): Avatar? {
-        return if (isChannel(video)) {
-            if (video.channel.avatar == null) {
-                video.account.avatar
-            } else {
-                video.channel.avatar
-            }
-        } else {
-            video.account.avatar
-        }
-    }
-
-    @JvmStatic
-    fun isChannel(video: Video): Boolean {
-        // c285b523-d688-43c5-a9ad-f745ff09bbd1
-        return !video.channel.name.matches("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}".toRegex())
-    }
-
-
-
-    @JvmStatic
-    fun getDuration(duration: Long?): String {
-        return DateUtils.formatElapsedTime(duration!!)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/helper/VideoHelper.java b/app/src/main/java/net/schueller/peertube/helper/VideoHelper.java
deleted file mode 100644
index 0482e37..0000000
--- a/app/src/main/java/net/schueller/peertube/helper/VideoHelper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.helper;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.util.Log;
-
-import net.schueller.peertube.R;
-
-public class VideoHelper {
-
-    private static final String TAG = "VideoHelper";
-
-    public static boolean canEnterPipMode(Context context) {
-
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
-
-        context.getString(R.string.pref_background_float_key);
-
-        // pref is disabled
-        if (!context.getString(R.string.pref_background_float_key).equals(
-                sharedPref.getString(
-                        context.getString(R.string.pref_background_behavior_key),
-                        context.getString(R.string.pref_background_float_key))
-            )
-        ) {
-            return false;
-        }
-
-        // api does not support it
-        Log.v(TAG, "api version " + Build.VERSION.SDK_INT);
-        if (Build.VERSION.SDK_INT > 27) {
-            AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
-            return (AppOpsManager.MODE_ALLOWED == appOpsManager.checkOp(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, android.os.Process.myUid(), context.getPackageName()));
-        }
-        return false;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/intents/Intents.kt b/app/src/main/java/net/schueller/peertube/intents/Intents.kt
deleted file mode 100644
index efbb442..0000000
--- a/app/src/main/java/net/schueller/peertube/intents/Intents.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.intents
-
-import android.Manifest
-import android.app.DownloadManager
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import net.schueller.peertube.helper.APIUrlHelper
-import android.webkit.MimeTypeMap
-import android.os.Environment
-import android.webkit.URLUtil
-import android.widget.Toast
-import androidx.core.app.ActivityCompat
-import net.schueller.peertube.R
-import net.schueller.peertube.model.Video
-import android.content.ContextWrapper
-
-import android.app.Activity
-
-
-
-
-
-object Intents {
-    private const val TAG = "Intents"
-
-    /**
-     * https://troll.tv/videos/watch/6edbd9d1-e3c5-4a6c-8491-646e2020469c
-     *
-     * @param context context
-     * @param video   video
-     */
-    // TODO, offer which version to download
-    @JvmStatic
-    fun Share(context: Context, video: Video) {
-        val intent = Intent()
-        intent.action = Intent.ACTION_SEND
-        intent.putExtra(Intent.EXTRA_SUBJECT, video.name)
-        intent.putExtra(Intent.EXTRA_TEXT, APIUrlHelper.getShareUrl(context, video.uuid))
-        intent.type = "text/plain"
-        context.startActivity(intent)
-    }
-
-    /**
-     * @param context context
-     * @param video   video
-     */
-    // TODO, offer which version to download
-    fun Download(context: Context, video: Video) {
-
-        // deal withe permissions here
-
-        // get permission to store file
-        if (ActivityCompat.checkSelfPermission(
-                context,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            val activity = getActivity(context)
-
-            if (activity != null) {
-                ActivityCompat.requestPermissions(
-                    activity,
-                    arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-                    0
-                )
-            }
-
-            if (ActivityCompat.checkSelfPermission(
-                    context,
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE
-                ) == PackageManager.PERMISSION_GRANTED
-            ) {
-                startDownload(video, context)
-            } else {
-                Toast.makeText(
-                    context,
-                    context.getString(R.string.video_download_permission_error),
-                    Toast.LENGTH_LONG
-                ).show()
-            }
-        } else {
-            startDownload(video, context)
-        }
-
-    }
-
-    private fun startDownload(video: Video, context: Context)
-    {
-        if (video.files.size > 0) {
-            val url = video.files[0].fileDownloadUrl
-            // make sure it is a valid filename
-            val destFilename = video.name.replace(
-                "[^a-zA-Z0-9]".toRegex(),
-                "_"
-            ) + "." + MimeTypeMap.getFileExtensionFromUrl(
-                URLUtil.guessFileName(url, null, null)
-            )
-
-            //Toast.makeText(context, destFilename, Toast.LENGTH_LONG).show();
-            val request = DownloadManager.Request(Uri.parse(url))
-            request.setDescription(video.description)
-            request.setTitle(video.name)
-            request.allowScanningByMediaScanner()
-            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, destFilename)
-
-            // get download service and enqueue file
-            val manager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-            manager.enqueue(request)
-        } else {
-            Toast.makeText(context, R.string.api_error, Toast.LENGTH_LONG).show()
-        }
-    }
-
-
-    private fun getActivity(context: Context?): Activity? {
-        if (context == null) {
-            return null
-        } else if (context is ContextWrapper) {
-            return if (context is Activity) {
-                context
-            } else {
-                getActivity(context.baseContext)
-            }
-        }
-        return null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Account.kt b/app/src/main/java/net/schueller/peertube/model/Account.kt
deleted file mode 100644
index 7296499..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Account.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import java.util.Date
-
-class Account(
-    var id: Int,
-    var url: String,
-    var uuid: String,
-    var name: String,
-    var host: String,
-    var followingCount: Int,
-    var followersCount: Int,
-    var avatar: Avatar?,
-    var createdAt: Date,
-    var updatedAt: Date,
-    var displayName: String,
-    var description: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Avatar.kt b/app/src/main/java/net/schueller/peertube/model/Avatar.kt
deleted file mode 100644
index fa04735..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Avatar.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import java.util.Date
-
-class Avatar(
-    var path: String,
-    var createdAt: Date,
-    var updatedAt: Date
-)
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Category.kt b/app/src/main/java/net/schueller/peertube/model/Category.kt
deleted file mode 100644
index edc3dd2..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Category.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import net.schueller.peertube.model.ui.OverviewRecycleViewItem
-
-class Category: OverviewRecycleViewItem() {
-
-    var id: Int? = null
-    var label: String? = null
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/CategoryVideo.kt b/app/src/main/java/net/schueller/peertube/model/CategoryVideo.kt
deleted file mode 100644
index 0a9c145..0000000
--- a/app/src/main/java/net/schueller/peertube/model/CategoryVideo.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
- *
- * License: GPL-3.0+
- * 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.
- *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import java.util.ArrayList
-
-class CategoryVideo(
-    val category: Category,
-    val videos: ArrayList<Video>
-)
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Channel.kt b/app/src/main/java/net/schueller/peertube/model/Channel.kt
deleted file mode 100644
index 5ebe094..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Channel.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import net.schueller.peertube.model.ui.OverviewRecycleViewItem
-import java.util.Date
-
-class Channel(
-    val id: Int,
-    val url: String,
-    val uuid: String,
-    val name: String,
-    val host: String,
-    val followingCount: Int,
-    val followersCount: Int,
-    val avatar: Avatar?,
-    val createdAt: Date,
-    val updatedAt: Date,
-    val displayName: String,
-    val description: String,
-    val support: String,
-    val local: Boolean
-): OverviewRecycleViewItem()
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/ChannelList.java b/app/src/main/java/net/schueller/peertube/model/ChannelList.java
deleted file mode 100644
index bd5204b..0000000
--- a/app/src/main/java/net/schueller/peertube/model/ChannelList.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.ArrayList;
-
-public class ChannelList {
-
-    @SerializedName("data")
-    private ArrayList<Channel> channelList;
-
-    public ArrayList<Channel> getChannelArrayList() {
-        return channelList;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/ChannelVideo.java b/app/src/main/java/net/schueller/peertube/model/ChannelVideo.java
deleted file mode 100644
index b4820be..0000000
--- a/app/src/main/java/net/schueller/peertube/model/ChannelVideo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
- *
- * License: GPL-3.0+
- * 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.
- *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import java.util.ArrayList;
-
-public class ChannelVideo {
-    private Channel channel;
-    private ArrayList<Video> videos;
-
-    public Channel getChannel() {
-        return channel;
-    }
-
-    public void setChannel(Channel channel) {
-        this.channel = channel;
-    }
-
-    public ArrayList<Video> getVideos() {
-        return videos;
-    }
-
-    public void setVideos(ArrayList<Video> videos) {
-        this.videos = videos;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Comment.kt b/app/src/main/java/net/schueller/peertube/model/Comment.kt
deleted file mode 100644
index 702b4d0..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Comment.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import java.util.*
-
-
-class Comment(
-
-    val id: Int,
-    val url: String,
-    val text: String,
-    val threadId: Int,
-    val inReplyToCommentId: Int? = null,
-    val videoId: Int,
-    val createdAt: Date,
-    val updatedAt: Date,
-    val deletedAt: Date? = null,
-    val isDeleted: Boolean,
-    val totalRepliesFromVideoAuthor: Int,
-    val totalReplies: Int,
-    val account: Account
-
-)
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/CommentThread.kt b/app/src/main/java/net/schueller/peertube/model/CommentThread.kt
deleted file mode 100644
index 1409a44..0000000
--- a/app/src/main/java/net/schueller/peertube/model/CommentThread.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import com.google.gson.annotations.SerializedName
-import net.schueller.peertube.model.ui.OverviewRecycleViewItem
-import java.util.ArrayList
-
-class CommentThread(
-    val total: Int,
-    val totalNotDeletedComments: Int,
-    @SerializedName("data")
-    val comments: ArrayList<Comment>
-
-): OverviewRecycleViewItem()
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Config.java b/app/src/main/java/net/schueller/peertube/model/Config.java
deleted file mode 100644
index 0d6c371..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Config.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Config {
-
-    // TODO: implement remaining items
-
-    private String serverVersion;
-
-    public String getServerVersion() {
-        return serverVersion;
-    }
-
-    public void setServerVersion(String serverVersion) {
-        this.serverVersion = serverVersion;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Description.java b/app/src/main/java/net/schueller/peertube/model/Description.java
deleted file mode 100644
index 2070a23..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Description.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Description {
-
-    private String description;
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/File.java b/app/src/main/java/net/schueller/peertube/model/File.java
deleted file mode 100644
index 1bdb917..0000000
--- a/app/src/main/java/net/schueller/peertube/model/File.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class File {
-    private Integer id;
-    private String fileDownloadUrl;
-    private Integer fps;
-    private Resolution resolution;
-    private String resolutionLabel;
-    private String magnetUri;
-    private Integer size;
-    private String torrentUrl;
-    private String torrentDownloadUrl;
-    private String fileUrl;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getFileDownloadUrl() {
-        return fileDownloadUrl;
-    }
-
-    public void setFileDownloadUrl(String fileDownloadUrl) {
-        this.fileDownloadUrl = fileDownloadUrl;
-    }
-
-    public Integer getFps() {
-        return fps;
-    }
-
-    public void setFps(Integer fps) {
-        this.fps = fps;
-    }
-
-    public Resolution getResolution() {
-        return resolution;
-    }
-
-    public void setResolution(Resolution resolution) {
-        this.resolution = resolution;
-    }
-
-    public String getResolutionLabel() {
-        return resolutionLabel;
-    }
-
-    public void setResolutionLabel(String resolutionLabel) {
-        this.resolutionLabel = resolutionLabel;
-    }
-
-    public String getMagnetUri() {
-        return magnetUri;
-    }
-
-    public void setMagnetUri(String magnetUri) {
-        this.magnetUri = magnetUri;
-    }
-
-    public Integer getSize() {
-        return size;
-    }
-
-    public void setSize(Integer size) {
-        this.size = size;
-    }
-
-    public String getTorrentUrl() {
-        return torrentUrl;
-    }
-
-    public void setTorrentUrl(String torrentUrl) {
-        this.torrentUrl = torrentUrl;
-    }
-
-    public String getTorrentDownloadUrl() {
-        return torrentDownloadUrl;
-    }
-
-    public void setTorrentDownloadUrl(String torrentDownloadUrl) {
-        this.torrentDownloadUrl = torrentDownloadUrl;
-    }
-
-    public String getFileUrl() {
-        return fileUrl;
-    }
-
-    public void setFileUrl(String fileUrl) {
-        this.fileUrl = fileUrl;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Language.java b/app/src/main/java/net/schueller/peertube/model/Language.java
deleted file mode 100644
index c3f05ce..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Language.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Language {
-
-    private String id;
-    private String label;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Licence.java b/app/src/main/java/net/schueller/peertube/model/Licence.java
deleted file mode 100644
index af68007..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Licence.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Licence {
-
-    private Integer id;
-    private String label;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Me.java b/app/src/main/java/net/schueller/peertube/model/Me.java
deleted file mode 100644
index 2e843fd..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Me.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Me {
-
-    private Integer id;
-    private Account account;
-    private Boolean autoPlayVideo;
-    private Boolean blocked;
-    private String blockedReason;
-    private String createdAt;
-    private String email;
-    private String emailVerified;
-    private String nsfwPolicy;
-    private Integer role;
-    private String roleLabel;
-    private String username;
-
-  //  private VideoChannels videoChannels;
-    private Integer videoQuota;
-    private Integer videoQuotaDaily;
-    private String webTorrentEnabled;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Account getAccount() {
-        return account;
-    }
-
-    public void setAccount(Account account) {
-        this.account = account;
-    }
-
-    public Boolean getAutoPlayVideo() {
-        return autoPlayVideo;
-    }
-
-    public void setAutoPlayVideo(Boolean autoPlayVideo) {
-        this.autoPlayVideo = autoPlayVideo;
-    }
-
-    public Boolean getBlocked() {
-        return blocked;
-    }
-
-    public void setBlocked(Boolean blocked) {
-        this.blocked = blocked;
-    }
-
-    public String getBlockedReason() {
-        return blockedReason;
-    }
-
-    public void setBlockedReason(String blockedReason) {
-        this.blockedReason = blockedReason;
-    }
-
-    public String getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(String createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getEmailVerified() {
-        return emailVerified;
-    }
-
-    public void setEmailVerified(String emailVerified) {
-        this.emailVerified = emailVerified;
-    }
-
-    public String getNsfwPolicy() {
-        return nsfwPolicy;
-    }
-
-    public void setNsfwPolicy(String nsfwPolicy) {
-        this.nsfwPolicy = nsfwPolicy;
-    }
-
-    public Integer getRole() {
-        return role;
-    }
-
-    public void setRole(Integer role) {
-        this.role = role;
-    }
-
-    public String getRoleLabel() {
-        return roleLabel;
-    }
-
-    public void setRoleLabel(String roleLabel) {
-        this.roleLabel = roleLabel;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public Integer getVideoQuota() {
-        return videoQuota;
-    }
-
-    public void setVideoQuota(Integer videoQuota) {
-        this.videoQuota = videoQuota;
-    }
-
-    public Integer getVideoQuotaDaily() {
-        return videoQuotaDaily;
-    }
-
-    public void setVideoQuotaDaily(Integer videoQuotaDaily) {
-        this.videoQuotaDaily = videoQuotaDaily;
-    }
-
-    public String getWebTorrentEnabled() {
-        return webTorrentEnabled;
-    }
-
-    public void setWebTorrentEnabled(String webTorrentEnabled) {
-        this.webTorrentEnabled = webTorrentEnabled;
-    }
-}
-
-
diff --git a/app/src/main/java/net/schueller/peertube/model/OauthClient.java b/app/src/main/java/net/schueller/peertube/model/OauthClient.java
deleted file mode 100644
index d744373..0000000
--- a/app/src/main/java/net/schueller/peertube/model/OauthClient.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import com.google.gson.annotations.SerializedName;
-
-public class OauthClient {
-
-    @SerializedName("client_id")
-    private String clientId;
-
-    @SerializedName("client_secret")
-    private String clientSecret;
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    public void setClientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Overview.kt b/app/src/main/java/net/schueller/peertube/model/Overview.kt
deleted file mode 100644
index 3616586..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Overview.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
- *
- * License: GPL-3.0+
- * 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.
- *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import java.util.ArrayList
-
-class Overview(
-    val categories: ArrayList<CategoryVideo>,
-    val channels: ArrayList<ChannelVideo>,
-    val tags: ArrayList<TagVideo>
-)
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Privacy.java b/app/src/main/java/net/schueller/peertube/model/Privacy.java
deleted file mode 100644
index 0bbcb32..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Privacy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Privacy {
-
-    private Integer id;
-    private String label;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Rating.java b/app/src/main/java/net/schueller/peertube/model/Rating.java
deleted file mode 100644
index 090e241..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Rating.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import com.google.gson.annotations.SerializedName;
-
-public class Rating {
-
-    @SerializedName("videoId")
-    private Integer videoId;
-
-    @SerializedName("rating")
-    private String rating;
-
-    public Integer getVideoId() {
-        return videoId;
-    }
-
-    public void setVideoId(Integer videoId) {
-        this.videoId = videoId;
-    }
-
-    public String getRating() {
-        return rating;
-    }
-
-    public void setRating(String rating) {
-        this.rating = rating;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Redundancy.java b/app/src/main/java/net/schueller/peertube/model/Redundancy.java
deleted file mode 100644
index e2a6abb..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Redundancy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Redundancy {
-
-    private String baseUrl;
-
-    public String getBaseUrl() {
-        return baseUrl;
-    }
-
-    public void setBaseUrl(final String baseUrl) {
-        this.baseUrl = baseUrl;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Resolution.java b/app/src/main/java/net/schueller/peertube/model/Resolution.java
deleted file mode 100644
index 3f2af0c..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Resolution.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class Resolution {
-
-    private Integer id;
-    private String label;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/Server.java b/app/src/main/java/net/schueller/peertube/model/Server.java
deleted file mode 100644
index 2fe2d66..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Server.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-
-public class Server {
-
-    private Integer id;
-    private String host;
-    private String name;
-    private String shortDescription;
-    private String version;
-    private Boolean signupAllowed;
-    private Double userVideoQuota;
-    private Category category;
-    private ArrayList<String> languages;
-    private Boolean autoBlacklistUserVideosEnabled;
-    private String defaultNSFWPolicy;
-    private Boolean isNSFW;
-    private Integer totalUsers;
-    private Integer totalVideos;
-    private Integer totalLocalVideos;
-    private Integer totalInstanceFollowers;
-    private Integer totalInstanceFollowing;
-    private Boolean supportsIPv6;
-    private String country;
-    private Integer health;
-    private Date createdAt;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public Boolean getSignupAllowed() {
-        return signupAllowed;
-    }
-
-    public void setSignupAllowed(Boolean signupAllowed) {
-        this.signupAllowed = signupAllowed;
-    }
-
-    public Double getUserVideoQuota() {
-        return userVideoQuota;
-    }
-
-    public void setUserVideoQuota(Double userVideoQuota) {
-        this.userVideoQuota = userVideoQuota;
-    }
-
-    public Category getCategory() {
-        return category;
-    }
-
-    public void setCategory(Category category) {
-        this.category = category;
-    }
-
-    public ArrayList<String> getLanguages() {
-        return languages;
-    }
-
-    public void setLanguages(ArrayList<String> languages) {
-        this.languages = languages;
-    }
-
-    public Boolean getAutoBlacklistUserVideosEnabled() {
-        return autoBlacklistUserVideosEnabled;
-    }
-
-    public void setAutoBlacklistUserVideosEnabled(Boolean autoBlacklistUserVideosEnabled) {
-        this.autoBlacklistUserVideosEnabled = autoBlacklistUserVideosEnabled;
-    }
-
-    public String getDefaultNSFWPolicy() {
-        return defaultNSFWPolicy;
-    }
-
-    public void setDefaultNSFWPolicy(String defaultNSFWPolicy) {
-        this.defaultNSFWPolicy = defaultNSFWPolicy;
-    }
-
-    public Boolean getNSFW() {
-        return isNSFW;
-    }
-
-    public void setNSFW(Boolean NSFW) {
-        isNSFW = NSFW;
-    }
-
-    public Integer getTotalUsers() {
-        return totalUsers;
-    }
-
-    public void setTotalUsers(Integer totalUsers) {
-        this.totalUsers = totalUsers;
-    }
-
-    public Integer getTotalVideos() {
-        return totalVideos;
-    }
-
-    public void setTotalVideos(Integer totalVideos) {
-        this.totalVideos = totalVideos;
-    }
-
-    public Integer getTotalLocalVideos() {
-        return totalLocalVideos;
-    }
-
-    public void setTotalLocalVideos(Integer totalLocalVideos) {
-        this.totalLocalVideos = totalLocalVideos;
-    }
-
-    public Integer getTotalInstanceFollowers() {
-        return totalInstanceFollowers;
-    }
-
-    public void setTotalInstanceFollowers(Integer totalInstanceFollowers) {
-        this.totalInstanceFollowers = totalInstanceFollowers;
-    }
-
-    public Integer getTotalInstanceFollowing() {
-        return totalInstanceFollowing;
-    }
-
-    public void setTotalInstanceFollowing(Integer totalInstanceFollowing) {
-        this.totalInstanceFollowing = totalInstanceFollowing;
-    }
-
-    public Boolean getSupportsIPv6() {
-        return supportsIPv6;
-    }
-
-    public void setSupportsIPv6(Boolean supportsIPv6) {
-        this.supportsIPv6 = supportsIPv6;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public Integer getHealth() {
-        return health;
-    }
-
-    public void setHealth(Integer health) {
-        this.health = health;
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/ServerList.java b/app/src/main/java/net/schueller/peertube/model/ServerList.java
deleted file mode 100644
index 6eb8d95..0000000
--- a/app/src/main/java/net/schueller/peertube/model/ServerList.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.ArrayList;
-
-public class ServerList {
-
-    @SerializedName("data")
-    private ArrayList<Server> serverList;
-
-    public ArrayList<Server> getServerArrayList() {
-        return serverList;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/State.java b/app/src/main/java/net/schueller/peertube/model/State.java
deleted file mode 100644
index 91f846f..0000000
--- a/app/src/main/java/net/schueller/peertube/model/State.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-public class State {
-
-    public static final int PUBLISHED = 1;
-    public static final int TO_TRANSCODE = 2;
-    public static final int TO_IMPORT = 3;
-    public static final int WAITING_FOR_LIVE = 4;
-    public static final int LIVE_ENDED = 5;
-
-    private Integer id;
-    private String label;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/StreamingPlaylist.java b/app/src/main/java/net/schueller/peertube/model/StreamingPlaylist.java
deleted file mode 100644
index 5767994..0000000
--- a/app/src/main/java/net/schueller/peertube/model/StreamingPlaylist.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import java.util.ArrayList;
-
-public class StreamingPlaylist {
-
-    private Integer id;
-    private Integer type;
-    private String playlistUrl;
-    private String segmentsSha256Url;
-    private ArrayList<Redundancy> redundancies;
-    private ArrayList<File> files;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(final Integer id) {
-        this.id = id;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(final Integer type) {
-        this.type = type;
-    }
-
-    public String getPlaylistUrl() {
-        return playlistUrl;
-    }
-
-    public void setPlaylistUrl(final String playlistUrl) {
-        this.playlistUrl = playlistUrl;
-    }
-
-    public String getSegmentsSha256Url() {
-        return segmentsSha256Url;
-    }
-
-    public void setSegmentsSha256Url(final String segmentsSha256Url) {
-        this.segmentsSha256Url = segmentsSha256Url;
-    }
-
-    public ArrayList<Redundancy> getRedundancies() {
-        return redundancies;
-    }
-
-    public void setRedundancies(final ArrayList<Redundancy> redundancies) {
-        this.redundancies = redundancies;
-    }
-
-    public ArrayList<File> getFiles() {
-        return files;
-    }
-
-    public void setFiles(final ArrayList<File> files) {
-        this.files = files;
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/model/TagVideo.kt b/app/src/main/java/net/schueller/peertube/model/TagVideo.kt
deleted file mode 100644
index ead7317..0000000
--- a/app/src/main/java/net/schueller/peertube/model/TagVideo.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
- *
- * License: GPL-3.0+
- * 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.
- *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import net.schueller.peertube.model.ui.OverviewRecycleViewItem
-import java.util.ArrayList
-
-class TagVideo(
-    var tag: String,
-    var videos: ArrayList<Video>
-): OverviewRecycleViewItem()
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Token.java b/app/src/main/java/net/schueller/peertube/model/Token.java
deleted file mode 100644
index 87db5da..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Token.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model;
-
-import com.google.gson.annotations.SerializedName;
-
-public class Token {
-
-    @SerializedName("access_token")
-    private String accessToken;
-
-    @SerializedName("expires_in")
-    private String expiresIn;
-
-    @SerializedName("refresh_token")
-    private String refreshToken;
-
-    @SerializedName("token_type")
-    private String tokenType;
-
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    public String getExpiresIn() {
-        return expiresIn;
-    }
-
-    public void setExpiresIn(String expiresIn) {
-        this.expiresIn = expiresIn;
-    }
-
-    public String getRefreshToken() {
-        return refreshToken;
-    }
-
-    public void setRefreshToken(String refreshToken) {
-        this.refreshToken = refreshToken;
-    }
-
-    public String getTokenType() {
-        return tokenType;
-    }
-
-    public void setTokenType(String tokenType) {
-        this.tokenType = tokenType;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/Video.kt b/app/src/main/java/net/schueller/peertube/model/Video.kt
deleted file mode 100644
index 69ed8f2..0000000
--- a/app/src/main/java/net/schueller/peertube/model/Video.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import android.content.Context
-import net.schueller.peertube.model.ui.OverviewRecycleViewItem
-import net.schueller.peertube.model.Licence
-import net.schueller.peertube.model.Privacy
-import net.schueller.peertube.model.StreamingPlaylist
-import android.support.v4.media.MediaDescriptionCompat
-import android.support.v4.media.MediaDescriptionCompat.Builder
-import java.util.ArrayList
-import java.util.Date
-
-class Video(
-
-    var id: Int,
-    var uuid: String,
-    var name: String,
-    var category: Category,
-    var licence: Licence,
-    var language: Language,
-    var nsfw: Boolean,
-    var description: String? = null,
-    var local: Boolean,
-    var live: Boolean,
-    var duration: Int,
-    var views: Int,
-    var likes: Int,
-    var dislikes: Int,
-    var thumbnailPath: String,
-    var previewPath: String,
-    var embedPath: String,
-    var createdAt: Date,
-    var updatedAt: Date,
-    var privacy: Privacy,
-    var support: String,
-    var descriptionPath: String,
-    var channel: Channel,
-    var account: Account,
-    var tags: ArrayList<String>,
-    var commentsEnabled: Boolean,
-    var downloadEnabled: Boolean,
-    var waitTranscoding: Boolean,
-    var state: State,
-    var trackerUrls: ArrayList<String>,
-    var files: ArrayList<File>,
-    var streamingPlaylists: ArrayList<StreamingPlaylist>
-
-): OverviewRecycleViewItem() {
-
-    companion object {
-
-        @JvmStatic
-        fun getMediaDescription(video: Video): MediaDescriptionCompat {
-
-//        String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
-
-//        Bundle extras = new Bundle();
-//        Bitmap bitmap = getBitmap(context, Uri.parse(apiBaseURL + video.thumbnailPath));
-//        extras.putParcelable(MediaDescriptionCompat.DESCRIPTION_KEY_MEDIA_URI, bitmap);
-            return Builder()
-                .setMediaId(video.uuid) //                .setIconBitmap(bitmap)
-                //                .setExtras(extras)
-                .setTitle(video.name)
-                .setDescription(video.description)
-                .build()
-        } //   TODO: add support for the thumbnail
-        //    public static Bitmap getBitmap(Context context, Uri fullThumbnailUrl) {
-        //
-        //         return Picasso.with(context).load(fullThumbnailUrl)
-        //                 .placeholder(R.drawable.ic_peertube)
-        //                 .error(R.drawable.ic_peertube).get();
-        //    }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/VideoList.kt b/app/src/main/java/net/schueller/peertube/model/VideoList.kt
deleted file mode 100644
index 36a1de4..0000000
--- a/app/src/main/java/net/schueller/peertube/model/VideoList.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.model
-
-import com.google.gson.annotations.SerializedName
-import java.util.ArrayList
-
-class VideoList(
-    @SerializedName("data")
-    val videos: ArrayList<Video>
-)
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/ui/OverviewRecycleViewItem.kt b/app/src/main/java/net/schueller/peertube/model/ui/OverviewRecycleViewItem.kt
deleted file mode 100644
index 9635b42..0000000
--- a/app/src/main/java/net/schueller/peertube/model/ui/OverviewRecycleViewItem.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.schueller.peertube.model.ui
-
-open class OverviewRecycleViewItem {
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/model/ui/VideoMetaViewItem.kt b/app/src/main/java/net/schueller/peertube/model/ui/VideoMetaViewItem.kt
deleted file mode 100644
index b2c0181..0000000
--- a/app/src/main/java/net/schueller/peertube/model/ui/VideoMetaViewItem.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.schueller.peertube.model.ui
-
-import net.schueller.peertube.model.Video
-
-class VideoMetaViewItem: OverviewRecycleViewItem() {
-    var video: Video? = null
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/AccessTokenAuthenticator.java b/app/src/main/java/net/schueller/peertube/network/AccessTokenAuthenticator.java
deleted file mode 100644
index 3756224..0000000
--- a/app/src/main/java/net/schueller/peertube/network/AccessTokenAuthenticator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import okhttp3.Authenticator;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.Route;
-
-public class AccessTokenAuthenticator implements Authenticator {
-
-    private static final String TAG = "ATAuthenticator";
-
-    public AccessTokenAuthenticator() {
-    }
-
-    @Nullable
-    @Override
-    public Request authenticate(Route route, @NonNull Response response) {
-        Session session = Session.getInstance();
-
-        // check if we are using tokens
-        final String accessToken = session.getToken();
-        if (!isRequestWithAccessToken(response) || accessToken == null) {
-            return null;
-        }
-        synchronized (this) {
-            final String newAccessToken = session.getToken();
-            // Access token is refreshed in another thread.
-            if (!accessToken.equals(newAccessToken)) {
-                Log.v(TAG, "Access token is refreshed in another thread");
-                return newRequestWithAccessToken(response.request(), newAccessToken);
-            }
-
-            // do we have a refresh token?
-            if (session.getRefreshToken() == null) {
-                Log.v(TAG, "No refresh token available");
-                return null;
-            }
-
-            Log.v(TAG, "refresh token: " + session.getRefreshToken());
-
-            // Need to refresh an access token
-            Log.v(TAG, "Need to refresh an access token");
-            final String updatedAccessToken = session.refreshAccessToken();
-            if (updatedAccessToken != null) {
-                return newRequestWithAccessToken(response.request(), updatedAccessToken);
-            }
-            Log.v(TAG, "Refresh failed");
-            return null;
-        }
-    }
-
-    private boolean isRequestWithAccessToken(@NonNull Response response) {
-        String header = response.request().header("Authorization");
-        return header != null && header.startsWith("Bearer");
-    }
-
-    @NonNull
-    private Request newRequestWithAccessToken(@NonNull Request request, @NonNull String accessToken) {
-        return request.newBuilder()
-                .header("Authorization", accessToken)
-                .build();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/AuthenticationService.java b/app/src/main/java/net/schueller/peertube/network/AuthenticationService.java
deleted file mode 100644
index eb12d9b..0000000
--- a/app/src/main/java/net/schueller/peertube/network/AuthenticationService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import net.schueller.peertube.model.OauthClient;
-import net.schueller.peertube.model.Token;
-
-import retrofit2.Call;
-import retrofit2.http.Field;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.GET;
-import retrofit2.http.POST;
-
-public interface AuthenticationService {
-    @GET("oauth-clients/local")
-    Call<OauthClient> getOauthClientLocal();
-
-    @FormUrlEncoded
-    @POST("users/token")
-    Call<Token> getAuthenticationToken(
-        @Field("client_id") String clientId,
-        @Field("client_secret") String clientSecret,
-        @Field("response_type") String responseType,
-        @Field("grant_type") String grantType,
-        @Field("scope") String scope,
-        @Field("username") String username,
-        @Field("password") String password
-    );
-
-    @POST("users/token")
-    @FormUrlEncoded
-    Call<Token> refreshToken(
-            @Field("client_id") String clientId,
-            @Field("client_secret") String clientSecret,
-            @Field("grant_type") String grantType,
-            @Field("response_type") String responseType,
-            @Field("username") String username,
-            @Field("refresh_token") String refreshToken
-    );
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/AuthorizationInterceptor.java b/app/src/main/java/net/schueller/peertube/network/AuthorizationInterceptor.java
deleted file mode 100644
index 90868ff..0000000
--- a/app/src/main/java/net/schueller/peertube/network/AuthorizationInterceptor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.schueller.peertube.network;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import java.io.IOException;
-
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class AuthorizationInterceptor implements Interceptor {
-
-    public AuthorizationInterceptor() {
-    }
-
-    @NonNull
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-
-        Session session = Session.getInstance();
-        Response mainResponse;
-        Request mainRequest = chain.request();
-
-        if (session.isLoggedIn()) {
-
-            // add authentication header to each request if we are logged in
-            Request.Builder builder = mainRequest.newBuilder().header("Authorization", session.getToken()).
-                    method(mainRequest.method(), mainRequest.body());
-           // Log.v("Authorization", "Intercept: " + session.getToken());
-
-            // build request
-            Request req = builder.build();
-            mainResponse = chain.proceed(req);
-
-            // logout on auth error
-            if (mainResponse.code() == 401 || mainResponse.code() == 403) {
-                session.invalidate();
-                Log.v("Authorization", "Intercept: Logout forced");
-            }
-
-        } else {
-            mainResponse = chain.proceed(chain.request());
-        }
-
-        return mainResponse;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/GetConfigDataService.java b/app/src/main/java/net/schueller/peertube/network/GetConfigDataService.java
deleted file mode 100644
index 7c4e42c..0000000
--- a/app/src/main/java/net/schueller/peertube/network/GetConfigDataService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import net.schueller.peertube.model.Config;
-import retrofit2.Call;
-import retrofit2.http.GET;
-
-public interface GetConfigDataService {
-
-    @GET("config")
-    Call<Config> getConfigData();
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java b/app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java
deleted file mode 100644
index a573b3a..0000000
--- a/app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import net.schueller.peertube.model.ServerList;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface GetServerListDataService {
-    @GET("instances/")
-    Call<ServerList> getInstancesData(
-            @Query("start") int start,
-            @Query("count") int count,
-            @Query("search") String text
-    );
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/GetUserService.java b/app/src/main/java/net/schueller/peertube/network/GetUserService.java
deleted file mode 100644
index fd512bb..0000000
--- a/app/src/main/java/net/schueller/peertube/network/GetUserService.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import com.google.gson.JsonObject;
-
-import net.schueller.peertube.model.Account;
-import net.schueller.peertube.model.Channel;
-import net.schueller.peertube.model.ChannelList;
-import net.schueller.peertube.model.Me;
-import net.schueller.peertube.model.VideoList;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import retrofit2.Call;
-import retrofit2.http.Body;
-import retrofit2.http.DELETE;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.POST;
-import retrofit2.http.PUT;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-public interface GetUserService {
-
-    @GET("users/me")
-    Call<Me> getMe();
-
-    @GET("users/me/subscriptions/videos")
-    Call<VideoList> getVideosSubscripions(
-            @Query("start") int start,
-            @Query("count") int count,
-            @Query("sort") String sort
-    );
-
-
-    @GET("accounts/{displayName}")
-    Call<Account> getAccount(
-            @Path(value = "displayName", encoded = true) String displayName
-    );
-
-
-    @GET("accounts/{displayName}/video-channels")
-    Call<ChannelList> getAccountChannels(
-            @Path(value = "displayName", encoded = true) String displayName
-    );
-
-    @GET("users/me/subscriptions/exist")
-    Call<JsonObject> subscriptionsExist(
-            @Query("uris") String videoChannelNameAndHost
-    );
-
-    @POST("users/me/subscriptions")
-    Call<ResponseBody> subscribe(
-            @Body RequestBody params
-    );
-
-    @DELETE("users/me/subscriptions/{videoChannelNameAndHost}")
-    Call<ResponseBody> unsubscribe(
-            @Path(value = "videoChannelNameAndHost", encoded = true) String videoChannelNameAndHost
-    );
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java b/app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java
deleted file mode 100644
index 86e18fa..0000000
--- a/app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import net.schueller.peertube.model.CommentThread;
-import net.schueller.peertube.model.Description;
-import net.schueller.peertube.model.Overview;
-import net.schueller.peertube.model.Rating;
-import net.schueller.peertube.model.Video;
-import net.schueller.peertube.model.VideoList;
-
-import java.util.Set;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import retrofit2.Call;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.PUT;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-public interface GetVideoDataService {
-    @GET("videos/")
-    Call<VideoList> getVideosData(
-            @Query("start") int start,
-            @Query("count") int count,
-            @Query("sort") String sort,
-            @Query("nsfw") String nsfw,
-            @Query("filter") String filter,
-            @Query("languageOneOf") Set<String> languages
-    );
-
-    @GET("videos/{uuid}")
-    Call<Video> getVideoData(
-            @Path(value = "uuid", encoded = true) String id
-    );
-
-    @GET("search/videos/")
-    Call<VideoList> searchVideosData(
-            @Query("start") int start,
-            @Query("count") int count,
-            @Query("sort") String sort,
-            @Query("nsfw") String nsfw,
-            @Query("search") String search,
-            @Query("filter") String filter,
-            @Query("languageOneOf") Set<String> languages
-    );
-
-    @GET("users/me/videos/{id}/rating")
-    Call<Rating> getVideoRating(
-            @Path(value = "id", encoded = true) Integer id
-    );
-
-    @GET("videos/{uuid}/description")
-    Call<Description> getVideoFullDescription(
-            @Path(value = "uuid", encoded = true) String id
-    );
-
-    @PUT("videos/{id}/rate")
-    Call<ResponseBody> rateVideo(
-            @Path(value = "id", encoded = true) Integer id,
-            @Body RequestBody params
-    );
-
-    // https://troll.tv/api/v1/accounts/theouterlinux@peertube.mastodon.host/videos?start=0&count=8&sort=-publishedAt
-
-    @GET("accounts/{displayNameAndHost}/videos")
-    Call<VideoList> getAccountVideosData(
-            @Path(value = "displayNameAndHost", encoded = true) String displayNameAndHost,
-            @Query("start") int start,
-            @Query("count") int count,
-            @Query("sort") String sort
-    );
-
-    @GET("overviews/videos")
-    Call<Overview> getOverviewVideosData(
-            @Query("page") int page
-    );
-
-    // https://troll.tv/api/v1/videos/{id}/comment-threads?start=0&count=10&sort=-createdAt
-    @GET("videos/{id}/comment-threads")
-    Call<CommentThread> getCommentThreads(
-            @Path(value = "id", encoded = true) Integer id,
-            @Query("start") int start,
-            @Query("count") int count,
-            @Query("sort") String sort
-    );
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java b/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
deleted file mode 100644
index 4f12db7..0000000
--- a/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import static net.schueller.peertube.network.UnsafeOkHttpClient.getUnsafeOkHttpClientBuilder;
-
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import net.schueller.peertube.R;
-import okhttp3.OkHttpClient;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
-
-public class RetrofitInstance {
-
-    private static Retrofit retrofit;
-    private static String baseUrl;
-
-    public static Retrofit getRetrofitInstance(String newBaseUrl, boolean insecure) {
-        if (retrofit == null || !newBaseUrl.equals(baseUrl)) {
-            baseUrl = newBaseUrl;
-
-            OkHttpClient.Builder okhttpClientBuilder;
-
-            if (!insecure) {
-                okhttpClientBuilder = new OkHttpClient.Builder();
-            } else {
-                okhttpClientBuilder = getUnsafeOkHttpClientBuilder();
-            }
-
-            okhttpClientBuilder.addInterceptor(new AuthorizationInterceptor());
-            okhttpClientBuilder.authenticator(new AccessTokenAuthenticator());
-
-            retrofit = new retrofit2.Retrofit.Builder()
-                    .client(okhttpClientBuilder.build())
-                    .baseUrl(baseUrl)
-                    .addConverterFactory(GsonConverterFactory.create())
-                    .build();
-        }
-        return retrofit;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/Session.java b/app/src/main/java/net/schueller/peertube/network/Session.java
deleted file mode 100644
index 2c4a3ad..0000000
--- a/app/src/main/java/net/schueller/peertube/network/Session.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.application.AppApplication;
-
-import static net.schueller.peertube.service.LoginService.refreshToken;
-
-public class Session {
-
-    private static volatile Session sSoleInstance;
-    private static SharedPreferences sharedPreferences;
-
-    //private constructor.
-    private Session() {
-
-        Context context = AppApplication.getContext();
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-
-        //Prevent form the reflection api.
-        if (sSoleInstance != null) {
-            throw new RuntimeException("Use getInstance() method to get the single instance of this class.");
-        }
-    }
-
-    public static Session getInstance() {
-        if (sSoleInstance == null) { //if there is no instance available... create new one
-            synchronized (Session.class) {
-                if (sSoleInstance == null) sSoleInstance = new Session();
-            }
-        }
-
-        return sSoleInstance;
-    }
-
-    //Make singleton from serialize and deserialize operation.
-    protected Session readResolve() {
-        return getInstance();
-    }
-
-
-    public boolean isLoggedIn() {
-        // check if token exist or not
-        // return true if exist otherwise false
-        // assuming that token exists
-
-        //Log.v("Session", "isLoggedIn: " + (getToken() != null));
-
-        return getToken() != null;
-    }
-
-    public String getToken() {
-        // return the token that was saved earlier
-
-        String token = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_token_access), null);
-        String type = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_token_type), "Bearer");
-
-        if (token != null) {
-            return type + " " + token;
-        }
-
-        return null;
-    }
-
-    public String getPassword() {
-        return sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_auth_password), null);
-
-    }
-
-    public String getRefreshToken() {
-        return sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_token_refresh), null);
-
-    }
-
-    public String refreshAccessToken() {
-
-        refreshToken();
-        // refresh token
-
-        return this.getToken();
-    }
-
-    public void invalidate() {
-        // get called when user become logged out
-        // delete token and other user info
-        // (i.e: email, password)
-        // from the storage
-
-        Context context = AppApplication.getContext();
-
-        SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString(context.getString(R.string.pref_auth_password), null);
-        editor.putString(context.getString(R.string.pref_auth_username), null);
-        editor.putString(context.getString(R.string.pref_token_access), null);
-        editor.putString(context.getString(R.string.pref_token_refresh), null);
-
-        editor.commit();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/network/UnsafeOkHttpClient.java b/app/src/main/java/net/schueller/peertube/network/UnsafeOkHttpClient.java
deleted file mode 100644
index 1961178..0000000
--- a/app/src/main/java/net/schueller/peertube/network/UnsafeOkHttpClient.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.network;
-
-import android.annotation.SuppressLint;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import okhttp3.OkHttpClient;
-import okhttp3.OkHttpClient.Builder;
-
-// Take from https://stackoverflow.com/questions/25509296/trusting-all-certificates-with-okhttp/25992879#25992879
-public class UnsafeOkHttpClient {
-    public static Builder getUnsafeOkHttpClientBuilder() {
-        try {
-            // Create a trust manager that does not validate certificate chains
-            final TrustManager[] trustAllCerts = new TrustManager[] {
-                    new X509TrustManager() {
-                        @SuppressLint("TrustAllX509TrustManager")
-                        @Override
-                        public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-                        }
-
-                        @SuppressLint("TrustAllX509TrustManager")
-                        @Override
-                        public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-                        }
-
-                        @Override
-                        public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                            return new java.security.cert.X509Certificate[]{};
-                        }
-                    }
-            };
-
-            // Install the all-trusting trust manager
-            final SSLContext sslContext = SSLContext.getInstance("SSL");
-            sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
-
-            // Create an ssl socket factory with our all-trusting manager
-            final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-
-            OkHttpClient.Builder builder = new OkHttpClient.Builder();
-            builder.sslSocketFactory(sslSocketFactory, (X509TrustManager)trustAllCerts[0]);
-            builder.hostnameVerifier((hostname, session) -> true);
-
-            return builder;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/provider/SearchSuggestionsProvider.java b/app/src/main/java/net/schueller/peertube/provider/SearchSuggestionsProvider.java
deleted file mode 100644
index 9fa6a76..0000000
--- a/app/src/main/java/net/schueller/peertube/provider/SearchSuggestionsProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.provider;
-
-import android.content.SearchRecentSuggestionsProvider;
-
-public class SearchSuggestionsProvider extends SearchRecentSuggestionsProvider {
-
-    public final static String AUTHORITY = SearchSuggestionsProvider.class.getName();
-    public static final int MODE = SearchRecentSuggestionsProvider.DATABASE_MODE_QUERIES;
-
-    public SearchSuggestionsProvider()
-    {
-        setupSuggestions(AUTHORITY, MODE);
-    }
-
-    // TODO: add search suggestions once they become available in peertube server
-
-}
diff --git a/app/src/main/java/net/schueller/peertube/service/LoginService.java b/app/src/main/java/net/schueller/peertube/service/LoginService.java
deleted file mode 100644
index ebed554..0000000
--- a/app/src/main/java/net/schueller/peertube/service/LoginService.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.service;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-
-import net.schueller.peertube.R;
-import net.schueller.peertube.application.AppApplication;
-import net.schueller.peertube.helper.APIUrlHelper;
-import net.schueller.peertube.model.OauthClient;
-import net.schueller.peertube.model.Token;
-import net.schueller.peertube.network.AuthenticationService;
-import net.schueller.peertube.network.RetrofitInstance;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-import static net.schueller.peertube.application.AppApplication.getContext;
-
-public class LoginService {
-
-    private static final String TAG = "LoginService";
-
-    public static void Authenticate(String username, String password) {
-        Context context = getContext();
-
-        String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
-
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
-
-        AuthenticationService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(AuthenticationService.class);
-
-        Call<OauthClient> call = service.getOauthClientLocal();
-
-        call.enqueue(new Callback<OauthClient>() {
-            @Override
-            public void onResponse(@NonNull Call<OauthClient> call, @NonNull Response<OauthClient> response) {
-
-                if (response.isSuccessful()) {
-
-                    OauthClient oauthClient = response.body();
-
-                    SharedPreferences.Editor editor = sharedPref.edit();
-
-                    assert oauthClient != null;
-
-                    editor.putString(context.getString(R.string.pref_client_id), oauthClient.getClientId());
-                    editor.putString(context.getString(R.string.pref_client_secret), oauthClient.getClientSecret());
-                    editor.apply();
-
-                    Call<Token> call2 = service.getAuthenticationToken(
-                            oauthClient.getClientId(),
-                            oauthClient.getClientSecret(),
-                            "code",
-                            "password",
-                            "upload",
-                            username,
-                            password
-                    );
-                    call2.enqueue(new Callback<Token>() {
-                        @Override
-                        public void onResponse(@NonNull Call<Token> call2, @NonNull retrofit2.Response<Token> response2) {
-
-                            if (response2.isSuccessful()) {
-
-                                Token token = response2.body();
-
-                                assert token != null;
-                                editor.putString(context.getString(R.string.pref_token_access), token.getAccessToken());
-                                editor.putString(context.getString(R.string.pref_token_refresh), token.getRefreshToken());
-                                editor.putString(context.getString(R.string.pref_token_type), token.getTokenType());
-                                editor.apply();
-
-                                Log.wtf(TAG, "Logged in");
-
-                                Toast.makeText(context, context.getString(R.string.authentication_login_success), Toast.LENGTH_LONG).show();
-
-
-                            } else {
-                                Log.wtf(TAG, response2.toString());
-                                Toast.makeText(context, context.getString(R.string.authentication_login_failed), Toast.LENGTH_LONG).show();
-
-                            }
-                        }
-
-                        @Override
-                        public void onFailure(@NonNull Call<Token> call2, @NonNull Throwable t2) {
-                            Log.wtf("err", t2.fillInStackTrace());
-                            Toast.makeText(context, context.getString(R.string.authentication_login_failed), Toast.LENGTH_LONG).show();
-
-                        }
-                    });
-
-                } else {
-                    Log.wtf(TAG, response.toString());
-                    Toast.makeText(context, context.getString(R.string.authentication_login_failed), Toast.LENGTH_LONG).show();
-
-                }
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<OauthClient> call, @NonNull Throwable t) {
-                Log.wtf("err", t.fillInStackTrace());
-                Toast.makeText(context, context.getString(R.string.authentication_login_failed), Toast.LENGTH_LONG).show();
-
-            }
-        });
-    }
-
-    public static void refreshToken() {
-        Context context = getContext();
-
-        String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        AuthenticationService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(AuthenticationService.class);
-
-        String refreshToken = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_token_refresh), null);
-        String userName = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_auth_username), null);
-        String clientId = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_client_id), null);
-        String clientSecret = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_client_secret), null);
-
-
-        Call<Token> call = service.refreshToken(
-                clientId,
-                clientSecret,
-                "refresh_token",
-                "code",
-                userName,
-                refreshToken
-        );
-        call.enqueue(new Callback<Token>() {
-            @Override
-            public void onResponse(@NonNull Call<Token> call, @NonNull retrofit2.Response<Token> response) {
-
-                if (response.isSuccessful()) {
-
-                    Token token = response.body();
-
-                    SharedPreferences.Editor editor = sharedPreferences.edit();
-
-                    assert token != null;
-                    editor.putString(context.getString(R.string.pref_token_access), token.getAccessToken());
-                    editor.putString(context.getString(R.string.pref_token_refresh), token.getRefreshToken());
-                    editor.putString(context.getString(R.string.pref_token_type), token.getTokenType());
-                    editor.apply();
-
-                    Log.wtf(TAG, "Logged in");
-
-                    Toast.makeText(context, context.getString(R.string.authentication_token_refresh_success), Toast.LENGTH_LONG).show();
-
-
-                } else {
-                    Log.wtf(TAG, response.toString());
-                    Toast.makeText(context, context.getString(R.string.authentication_token_refresh_failed), Toast.LENGTH_LONG).show();
-
-                }
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<Token> call2, @NonNull Throwable t2) {
-                Log.wtf("err", t2.fillInStackTrace());
-                Toast.makeText(context, context.getString(R.string.authentication_token_refresh_failed), Toast.LENGTH_LONG).show();
-
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.kt b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.kt
deleted file mode 100644
index 80964c2..0000000
--- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.kt
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package net.schueller.peertube.service
-
-import android.app.Notification
-import net.schueller.peertube.helper.MetaDataHelper.getMetaString
-import net.schueller.peertube.model.Video.Companion.getMediaDescription
-import android.os.IBinder
-import com.google.android.exoplayer2.ui.PlayerNotificationManager
-import android.content.IntentFilter
-import android.media.AudioManager
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
-import android.media.session.PlaybackState
-import android.content.Intent
-import android.widget.Toast
-import net.schueller.peertube.helper.APIUrlHelper
-import net.schueller.peertube.network.UnsafeOkHttpClient
-import com.google.android.exoplayer2.source.MediaSource
-import com.google.android.exoplayer2.source.hls.HlsMediaSource
-import com.google.android.exoplayer2.source.ProgressiveMediaSource
-import com.google.android.exoplayer2.ui.PlayerNotificationManager.MediaDescriptionAdapter
-import android.app.PendingIntent
-import android.app.Service
-import net.schueller.peertube.activity.VideoPlayActivity
-import net.schueller.peertube.activity.VideoListActivity
-import android.graphics.Bitmap
-import android.support.v4.media.session.MediaSessionCompat
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
-import com.google.android.exoplayer2.ext.mediasession.TimelineQueueNavigator
-import android.support.v4.media.MediaDescriptionCompat
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.net.Uri
-import android.os.Binder
-import android.util.Log
-import android.webkit.URLUtil
-import androidx.core.app.NotificationCompat
-import com.google.android.exoplayer2.*
-import com.google.android.exoplayer2.audio.AudioAttributes
-import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
-import com.google.android.exoplayer2.ui.PlayerNotificationManager.NotificationListener
-import net.schueller.peertube.R.drawable
-import net.schueller.peertube.R.string
-import net.schueller.peertube.model.Video
-import java.lang.Exception
-
-class VideoPlayerService : Service() {
-
-    private val mBinder: IBinder = LocalBinder()
-    @JvmField
-    var player: ExoPlayer? = null
-    private var currentVideo: Video? = null
-    private var currentStreamUrl: String? = null
-    private var currentStreamUrlIsHLS = false
-    private var playerNotificationManager: PlayerNotificationManager? = null
-    private val becomeNoisyIntentFilter = IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)
-    private val myNoisyAudioStreamReceiver = BecomingNoisyReceiver()
-    override fun onCreate() {
-        Log.v(TAG, "onCreate...")
-        super.onCreate()
-        player = ExoPlayer.Builder(applicationContext)
-            .setTrackSelector(DefaultTrackSelector(applicationContext))
-            .build()
-
-        // Stop player if audio device changes, e.g. headphones unplugged
-        player!!.addListener(object : Player.Listener {
-            override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
-                if (playbackState.toLong() == PlaybackState.ACTION_PAUSE) { // this means that pause is available, hence the audio is playing
-                    Log.v(TAG, "ACTION_PLAY: $playbackState")
-                    registerReceiver(myNoisyAudioStreamReceiver, becomeNoisyIntentFilter)
-                }
-                if (playbackState
-                        .toLong() == PlaybackState.ACTION_PLAY
-                ) { // this means that play is available, hence the audio is paused or stopped
-                    Log.v(TAG, "ACTION_PAUSE: $playbackState")
-                    safeUnregisterReceiver()
-                }
-            }
-        })
-    }
-
-    inner class LocalBinder : Binder() {
-
-        // Return this instance of VideoPlayerService so clients can call public methods
-        val service: VideoPlayerService
-            get() =// Return this instance of VideoPlayerService so clients can call public methods
-                this@VideoPlayerService
-    }
-
-    override fun onDestroy() {
-        Log.v(TAG, "onDestroy...")
-        if (playerNotificationManager != null) {
-            playerNotificationManager!!.setPlayer(null)
-        }
-        //Was seeing an error when exiting the program about not unregistering the receiver.
-        safeUnregisterReceiver()
-        if (player != null) {
-            player!!.release()
-            player = null
-        }
-        super.onDestroy()
-    }
-
-    private fun safeUnregisterReceiver() {
-        try {
-            unregisterReceiver(myNoisyAudioStreamReceiver)
-        } catch (e: Exception) {
-            Log.e("VideoPlayerService", "attempted to unregister a non-registered service")
-        }
-    }
-
-    override fun onBind(intent: Intent): IBinder {
-        return mBinder
-    }
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        val context: Context = this
-        Log.v(TAG, "onStartCommand...")
-        return if (!URLUtil.isValidUrl(currentStreamUrl)) {
-            Toast.makeText(context, "Invalid URL provided. Unable to play video.", Toast.LENGTH_SHORT).show()
-            START_NOT_STICKY
-        } else {
-            playVideo()
-            START_STICKY
-        }
-    }
-
-    fun setCurrentVideo(video: Video?) {
-        Log.v(TAG, "setCurrentVideo...")
-        currentVideo = video
-    }
-
-    fun setCurrentStreamUrl(streamUrl: String, isHLS: Boolean) {
-        Log.v(TAG, "setCurrentStreamUrl...$streamUrl")
-        currentStreamUrlIsHLS = isHLS
-        currentStreamUrl = streamUrl
-    }
-
-    /**
-     * Returns the current playback speed of the player.
-     *
-     * @return the current playback speed of the player.
-     *///Playback speed control
-    var playBackSpeed: Float
-        get() = player!!.playbackParameters.speed
-        set(speed) {
-            Log.v(TAG, "setPlayBackSpeed...")
-            player!!.playbackParameters = PlaybackParameters(speed)
-        }
-
-    private fun playVideo() {
-        val context: Context = this
-
-        // We need a valid URL
-        Log.v(TAG, "playVideo...")
-
-        // Produces DataSource instances through which media data is loaded.
-        val okhttpClientBuilder: okhttp3.OkHttpClient.Builder = if (!APIUrlHelper.useInsecureConnection(this)) {
-            okhttp3.OkHttpClient.Builder()
-        } else {
-            UnsafeOkHttpClient.getUnsafeOkHttpClientBuilder()
-        }
-
-        // Create a data source factory.
-        val dataSourceFactory:  OkHttpDataSource.Factory =  OkHttpDataSource.Factory(
-            okhttpClientBuilder.build()
-        )
-
-        // Create a progressive media source pointing to a stream uri.
-        val mediaSource: MediaSource = if (currentStreamUrlIsHLS) {
-            HlsMediaSource.Factory(dataSourceFactory)
-                .createMediaSource(MediaItem.fromUri(Uri.parse(currentStreamUrl)))
-        } else {
-            ProgressiveMediaSource.Factory(dataSourceFactory)
-                .createMediaSource(MediaItem.fromUri(Uri.parse(currentStreamUrl)))
-        }
-
-        // Set the media source to be played.
-        player!!.setMediaSource(mediaSource)
-
-        // Prepare the player.
-        player!!.prepare()
-
-        // Auto play
-        player!!.playWhenReady = true
-
-        //set playback speed to global default
-        val sharedPref = getSharedPreferences(
-            packageName + "_preferences",
-            Context.MODE_PRIVATE
-        )
-
-        val speed = sharedPref.getString(getString(string.pref_video_speed_key), "1.0")!!.toFloat()
-        playBackSpeed = speed
-
-        playerNotificationManager = PlayerNotificationManager.Builder(
-            this,
-            PLAYBACK_NOTIFICATION_ID,
-            PLAYBACK_CHANNEL_ID,
-        ).setMediaDescriptionAdapter(
-                object : MediaDescriptionAdapter {
-                    override fun getCurrentContentTitle(player: Player): CharSequence {
-                        return currentVideo!!.name
-                    }
-
-                    override fun createCurrentContentIntent(player: Player): PendingIntent? {
-                        val intent = Intent(context, VideoPlayActivity::class.java)
-                        intent.putExtra(VideoListActivity.EXTRA_VIDEOID, currentVideo!!.uuid)
-                        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-                    }
-
-                    override fun getCurrentContentText(player: Player): CharSequence {
-                        return getMetaString(
-                                currentVideo!!.createdAt,
-                                currentVideo!!.views,
-                                baseContext
-                        )
-                    }
-
-                    override fun getCurrentSubText(player: Player): CharSequence { return ""}
-
-                    override fun getCurrentLargeIcon(
-                            player: Player,
-                            callback: PlayerNotificationManager.BitmapCallback
-                    ): Bitmap? {
-                        return null
-                    }
-                }
-        ).setNotificationListener(
-            object : NotificationListener {
-
-                override fun onNotificationPosted(notificationId: Int, notification: Notification, ongoing: Boolean) {
-                    super.onNotificationPosted(notificationId, notification, ongoing)
-                    if (ongoing) // allow notification to be dismissed if player is stopped
-                        startForeground(notificationId, notification)
-                    else
-                        stopForeground(false)
-                }
-
-                override fun onNotificationCancelled(notificationId: Int, dismissedByUser: Boolean) {
-                    super.onNotificationCancelled(notificationId, dismissedByUser)
-                    stopSelf()
-                    stopForeground(true)
-                }
-            }
-        ).setChannelNameResourceId(string.playback_channel_name)
-        .setChannelDescriptionResourceId(string.playback_channel_description)
-        .build()
-
-        playerNotificationManager!!.setPriority(NotificationCompat.PRIORITY_DEFAULT)
-
-        playerNotificationManager!!.setSmallIcon(drawable.ic_logo_bw)
-
-        // don't show skip buttons in notification
-        playerNotificationManager!!.setUseNextAction(false)
-        playerNotificationManager!!.setUsePreviousAction(false)
-
-        playerNotificationManager!!.setPlayer(player)
-
-        // external Media control, Android Wear / Google Home etc.
-        val mediaSession = MediaSessionCompat(context, MEDIA_SESSION_TAG)
-        mediaSession.isActive = true
-        playerNotificationManager!!.setMediaSessionToken(mediaSession.sessionToken)
-        val mediaSessionConnector = MediaSessionConnector(mediaSession)
-        mediaSessionConnector.setQueueNavigator(object : TimelineQueueNavigator(mediaSession) {
-            override fun getMediaDescription(player: Player, windowIndex: Int): MediaDescriptionCompat {
-                return getMediaDescription(currentVideo!!)
-            }
-        })
-        mediaSessionConnector.setPlayer(player)
-
-        // Audio Focus
-        val audioAttributes = AudioAttributes.Builder()
-            .setUsage(C.USAGE_MEDIA)
-            .setContentType(C.CONTENT_TYPE_MOVIE)
-            .build()
-        player!!.setAudioAttributes(audioAttributes, true)
-    }
-
-    // pause playback on audio output change
-    private inner class BecomingNoisyReceiver : BroadcastReceiver() {
-
-        override fun onReceive(context: Context, intent: Intent) {
-            if (AudioManager.ACTION_AUDIO_BECOMING_NOISY == intent.action) {
-                player!!.playWhenReady = false
-            }
-        }
-    }
-
-    companion object {
-
-        private const val TAG = "VideoPlayerService"
-        private const val MEDIA_SESSION_TAG = "peertube_player"
-        private const val PLAYBACK_CHANNEL_ID = "playback_channel"
-        private const val PLAYBACK_NOTIFICATION_ID = 1
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/utils/Extensions.kt b/app/src/main/java/net/schueller/peertube/utils/Extensions.kt
deleted file mode 100644
index 6a4600a..0000000
--- a/app/src/main/java/net/schueller/peertube/utils/Extensions.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.schueller.peertube.utils
-
-import android.content.Context
-import android.view.View
-import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-
-fun View.gone() {
-    this.visibility = View.GONE
-}
-
-fun View.visible() {
-    this.visibility = View.VISIBLE
-}
-
-fun View.invisible() {
-    this.visibility = View.INVISIBLE
-}
-
-fun View.visibleIf(predicate: () -> Boolean) {
-    when (predicate.invoke()) {
-        true -> visible()
-        else -> gone()
-    }
-}
-
-fun View.goneIf(predicate: () -> Boolean) {
-    when (predicate.invoke()) {
-        true -> gone()
-        else -> visible()
-    }
-}
-
-fun View.invisibleIf(predicate: () -> Boolean) {
-    when (predicate.invoke()) {
-        true -> invisible()
-        else -> visible()
-    }
-}
-
-fun Fragment.hideKeyboard(): Boolean {
-    activity?.currentFocus?.let {
-        val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.hideSoftInputFromWindow(it.windowToken, 0)
-        return true
-    }
-    return false
-}
-
-fun AppCompatActivity.hideKeyboard(): Boolean {
-    currentFocus?.let {
-        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.hideSoftInputFromWindow(it.windowToken, 0)
-        return true
-    }
-    return false
-}
diff --git a/app/src/main/res/anim/slide_in_bottom.xml b/app/src/main/res/anim/slide_in_bottom.xml
deleted file mode 100644
index da3edb3..0000000
--- a/app/src/main/res/anim/slide_in_bottom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="250"
-    android:fromYDelta="0%p"
-    android:toYDelta="-100%p">
-</translate>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_bottom.xml b/app/src/main/res/anim/slide_out_bottom.xml
deleted file mode 100644
index 737b8cf..0000000
--- a/app/src/main/res/anim/slide_out_bottom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="200"
-    android:fromYDelta="100%p"
-    android:toYDelta="0">
-</translate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh.png b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
deleted file mode 100644
index 5591fbc..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_share.png b/app/src/main/res/drawable-hdpi/ic_action_share.png
deleted file mode 100644
index 1a61144..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh.png b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
deleted file mode 100644
index d62c167..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_share.png b/app/src/main/res/drawable-mdpi/ic_action_share.png
deleted file mode 100644
index 829087f..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
deleted file mode 100644
index 0cb7a90..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_share.png b/app/src/main/res/drawable-xhdpi/ic_action_share.png
deleted file mode 100644
index ee68121..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
deleted file mode 100644
index 2f2cd5f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_share.png b/app/src/main/res/drawable-xxhdpi/ic_action_share.png
deleted file mode 100644
index daaf300..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xxxhdpi/ic_action_refresh.png
deleted file mode 100644
index 12d4c43..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_share.png b/app/src/main/res/drawable-xxxhdpi/ic_action_share.png
deleted file mode 100644
index d497fa9..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
deleted file mode 100644
index 89199eb..0000000
--- a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_add_24.xml b/app/src/main/res/drawable/ic_baseline_add_24.xml
deleted file mode 100644
index eb23254..0000000
--- a/app/src/main/res/drawable/ic_baseline_add_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_close_24.xml b/app/src/main/res/drawable/ic_baseline_close_24.xml
deleted file mode 100644
index 16d6d37..0000000
--- a/app/src/main/res/drawable/ic_baseline_close_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_help_24.xml b/app/src/main/res/drawable/ic_baseline_help_24.xml
deleted file mode 100644
index c0c9268..0000000
--- a/app/src/main/res/drawable/ic_baseline_help_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_person_pin_24.xml b/app/src/main/res/drawable/ic_baseline_person_pin_24.xml
deleted file mode 100644
index fd6018c..0000000
--- a/app/src/main/res/drawable/ic_baseline_person_pin_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,2c-4.97,0 -9,4.03 -9,9 0,4.17 2.84,7.67 6.69,8.69L12,22l2.31,-2.31C18.16,18.67 21,15.17 21,11c0,-4.97 -4.03,-9 -9,-9zM12,4c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,18.3c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_remove_red_eye_24.xml b/app/src/main/res/drawable/ic_baseline_remove_red_eye_24.xml
deleted file mode 100644
index a3e222a..0000000
--- a/app/src/main/res/drawable/ic_baseline_remove_red_eye_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_settings_24.xml b/app/src/main/res/drawable/ic_baseline_settings_24.xml
deleted file mode 100644
index 41a82ed..0000000
--- a/app/src/main/res/drawable/ic_baseline_settings_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_video_library_24.xml b/app/src/main/res/drawable/ic_baseline_video_library_24.xml
deleted file mode 100644
index 2259eaf..0000000
--- a/app/src/main/res/drawable/ic_baseline_video_library_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM12,14.5v-9l6,4.5 -6,4.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
deleted file mode 100644
index 991e1ca..0000000
--- a/app/src/main/res/drawable/ic_close.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M18,6L6,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6,6L18,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
deleted file mode 100644
index ae6a446..0000000
--- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit_24.xml b/app/src/main/res/drawable/ic_edit_24.xml
deleted file mode 100644
index 2844baf..0000000
--- a/app/src/main/res/drawable/ic_edit_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
deleted file mode 100644
index 0c36320..0000000
--- a/app/src/main/res/drawable/ic_home_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml
deleted file mode 100644
index 34b8202..0000000
--- a/app/src/main/res/drawable/ic_info_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
deleted file mode 100644
index 0ea6c12..0000000
--- a/app/src/main/res/drawable/ic_logo.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="297dp"
-    android:viewportWidth="210"
-    android:viewportHeight="297">
-  <path
-      android:pathData="M66.23,115.617V72.97h-15.231v-8.683h40.791v8.683H76.594v42.647z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1.79270971"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m108.247,64.287v18.872q4.762,-5.567 11.38,-5.567 3.396,0 6.127,1.26 2.731,1.26 4.097,3.221 1.401,1.961 1.891,4.342 0.525,2.381 0.525,7.388v21.814h-9.839V95.974q0,-5.847 -0.56,-7.423 -0.56,-1.576 -1.996,-2.486 -1.401,-0.945 -3.536,-0.945 -2.451,0 -4.377,1.19 -1.926,1.19 -2.836,3.606 -0.875,2.381 -0.875,7.073V115.617H98.408V64.287Z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1.79270971"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m122.291,52.191l0,-2.188q0.769,0.341 1.472,0.515 0.702,0.166 1.388,0.166 1.438,0 2.241,-0.753 0.803,-0.761 0.945,-2.252 -0.569,0.396 -1.213,0.595 -0.644,0.198 -1.397,0.198 -1.915,0 -3.094,-1.054 -1.171,-1.062 -1.171,-2.791 0,-1.911 1.305,-3.06 1.313,-1.15 3.512,-1.15 2.442,0 3.78,1.562 1.338,1.562 1.338,4.416 0,2.933 -1.564,4.614 -1.564,1.673 -4.29,1.673 -0.878,0 -1.681,-0.127 -0.803,-0.119 -1.572,-0.365zM126.264,46.49q0.845,0 1.271,-0.515 0.427,-0.523 0.427,-1.562 0,-1.031 -0.427,-1.554 -0.427,-0.523 -1.271,-0.523 -0.845,0 -1.271,0.523 -0.427,0.523 -0.427,1.554 0,1.039 0.427,1.562 0.427,0.515 1.271,0.515z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.41690993"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m140.364,46.522q0,-2.22 -0.443,-3.124 -0.435,-0.912 -1.472,-0.912 -1.037,0 -1.48,0.912 -0.443,0.904 -0.443,3.124 0,2.244 0.443,3.163 0.443,0.92 1.48,0.92 1.029,0 1.472,-0.92 0.443,-0.92 0.443,-3.163zM143.584,46.546q0,2.941 -1.338,4.543 -1.338,1.594 -3.797,1.594 -2.467,0 -3.805,-1.594 -1.338,-1.602 -1.338,-4.543 0,-2.949 1.338,-4.543 1.338,-1.602 3.805,-1.602 2.459,0 3.797,1.602 1.338,1.594 1.338,4.543z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.41690993"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_logo_bw.xml b/app/src/main/res/drawable/ic_logo_bw.xml
deleted file mode 100644
index 6475382..0000000
--- a/app/src/main/res/drawable/ic_logo_bw.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="297dp"
-    android:viewportWidth="210"
-    android:viewportHeight="297">
-  <path
-      android:pathData="M40.049,33.472H143.216c4.123,0 7.442,3.319 7.442,7.442v98.075c0,4.123 -3.319,7.442 -7.442,7.442H40.049c-4.123,0 -7.442,-3.319 -7.442,-7.442v-98.075c0,-4.123 3.319,-7.442 7.442,-7.442z"
-      android:strokeAlpha="1"
-      android:strokeWidth="3"
-      android:fillColor="#ececec"
-      android:fillAlpha="0"
-      android:strokeColor="#211f20"/>
-  <path
-      android:pathData="M66.23,115.617V72.97h-15.231v-8.683h40.791v8.683H76.594v42.647z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1.79270971"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m108.247,64.287v18.872q4.762,-5.567 11.38,-5.567 3.396,0 6.127,1.26 2.731,1.26 4.097,3.221 1.401,1.961 1.891,4.342 0.525,2.381 0.525,7.388v21.814h-9.839V95.974q0,-5.847 -0.56,-7.423 -0.56,-1.576 -1.996,-2.486 -1.401,-0.945 -3.536,-0.945 -2.451,0 -4.377,1.19 -1.926,1.19 -2.836,3.606 -0.875,2.381 -0.875,7.073V115.617H98.408V64.287Z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1.79270971"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m122.291,52.191l0,-2.188q0.769,0.341 1.472,0.515 0.702,0.166 1.388,0.166 1.438,0 2.241,-0.753 0.803,-0.761 0.945,-2.252 -0.569,0.396 -1.213,0.595 -0.644,0.198 -1.397,0.198 -1.915,0 -3.094,-1.054 -1.171,-1.062 -1.171,-2.791 0,-1.911 1.305,-3.06 1.313,-1.15 3.512,-1.15 2.442,0 3.78,1.562 1.338,1.562 1.338,4.416 0,2.933 -1.564,4.614 -1.564,1.673 -4.29,1.673 -0.878,0 -1.681,-0.127 -0.803,-0.119 -1.572,-0.365zM126.264,46.49q0.845,0 1.271,-0.515 0.427,-0.523 0.427,-1.562 0,-1.031 -0.427,-1.554 -0.427,-0.523 -1.271,-0.523 -0.845,0 -1.271,0.523 -0.427,0.523 -0.427,1.554 0,1.039 0.427,1.562 0.427,0.515 1.271,0.515z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.41690993"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m140.364,46.522q0,-2.22 -0.443,-3.124 -0.435,-0.912 -1.472,-0.912 -1.037,0 -1.48,0.912 -0.443,0.904 -0.443,3.124 0,2.244 0.443,3.163 0.443,0.92 1.48,0.92 1.029,0 1.472,-0.92 0.443,-0.92 0.443,-3.163zM143.584,46.546q0,2.941 -1.338,4.543 -1.338,1.594 -3.797,1.594 -2.467,0 -3.805,-1.594 -1.338,-1.602 -1.338,-4.543 0,-2.949 1.338,-4.543 1.338,-1.602 3.805,-1.602 2.459,0 3.797,1.602 1.338,1.594 1.338,4.543z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.41690993"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml
deleted file mode 100644
index 0262382..0000000
--- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_peertube.xml b/app/src/main/res/drawable/ic_peertube.xml
deleted file mode 100644
index df27beb..0000000
--- a/app/src/main/res/drawable/ic_peertube.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-  <path
-      android:pathData="m0.0336,0.34v10.667l8,-5.333"
-      android:fillColor="#211f20"/>
-  <path
-      android:pathData="m0.0336,11.007v10.667l8,-5.333"
-      android:fillColor="#737373"/>
-  <path
-      android:pathData="m8.0336,5.673v10.667l8,-5.333"
-      android:fillColor="#FF0DDEF1"/>
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_peertube_bw.xml b/app/src/main/res/drawable/ic_peertube_bw.xml
deleted file mode 100644
index 1f00282..0000000
--- a/app/src/main/res/drawable/ic_peertube_bw.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-  <path
-      android:pathData="m0.0336,0.34v10.667l8,-5.333"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="m0.0336,11.007v10.667l8,-5.333"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="m8.0336,5.673v10.667l8,-5.333"
-      android:fillColor="#000000"/>
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml
deleted file mode 100644
index 5a283aa..0000000
--- a/app/src/main/res/drawable/ic_sync_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_trending.xml b/app/src/main/res/drawable/ic_trending.xml
deleted file mode 100644
index 06066af..0000000
--- a/app/src/main/res/drawable/ic_trending.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M23,6l-9.5,9.5l-5,-5l-7.5,7.5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M17,6l6,0l0,6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
deleted file mode 100644
index 15c39b9..0000000
--- a/app/src/main/res/layout/activity_account.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="net.schueller.peertube.activity.AccountActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/account_appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/tool_bar_account"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:elevation="4dp"
-             />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/account_about"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/account_navigation"
-        android:visibility="gone"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:layout_below="@+id/account_appbar">
-
-            <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="6dp">
-
-                <LinearLayout
-
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="18dp"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:orientation="vertical">
-
-                    <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/account_avatar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="0dp"
-                        android:paddingStart="12dp"
-                        android:paddingTop="12dp"
-                        android:paddingEnd="12dp" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:text="@string/account_about_account"
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-                        <Space
-                            android:layout_width="12dp"
-                            android:layout_height="1dp" />
-
-                        <TextView
-                            android:id="@+id/account_owner_string"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center|start"
-                            android:text=""
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:text="@string/account_about_subscribers"
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-                        <Space
-                            android:layout_width="12dp"
-                            android:layout_height="1dp" />
-
-                        <TextView
-                            android:id="@+id/account_followers"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center|start"
-                            android:text=""
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:text="@string/account_about_description"
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-                        <Space
-                            android:layout_width="12dp"
-                            android:layout_height="1dp" />
-
-                        <TextView
-                            android:id="@+id/account_description"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center|start"
-                            android:text=""
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:text="@string/account_about_joined"
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-                        <Space
-                            android:layout_width="12dp"
-                            android:layout_height="1dp" />
-
-                        <TextView
-                            android:id="@+id/account_joined"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center|start"
-                            android:text=""
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-                    </LinearLayout>
-
-
-                </LinearLayout>
-
-
-            </RelativeLayout>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/account_swipeRefreshLayout_videos"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/account_navigation"
-        android:layout_below="@+id/account_appbar"
-        android:layout_weight="1"
-
-        android:visibility="visible"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/account_video_recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/account_swipeRefreshLayout_channels"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/account_navigation"
-        android:layout_below="@+id/account_appbar"
-        android:layout_weight="1"
-
-        android:visibility="gone"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/account_channel_recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/account_navigation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="?android:attr/windowBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/menu_bottom_account" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_me.xml b/app/src/main/res/layout/activity_me.xml
deleted file mode 100644
index e9ccf91..0000000
--- a/app/src/main/res/layout/activity_me.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              tools:context=".activity.MeActivity"
-              android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar_me"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-                android:id="@+id/tool_bar_me"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:elevation="4dp"/>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-
-    <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-
-            <LinearLayout
-                    android:visibility="gone"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:layout_marginBottom="12dp"
-                    android:id="@+id/a_me_account_line"
-                    android:orientation="horizontal">
-
-                <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                    <de.hdodenhof.circleimageview.CircleImageView
-                            android:id="@+id/a_me_avatar"
-                            android:layout_width="72dp"
-                            android:layout_height="72dp"
-                            android:layout_marginTop="0dp"
-                            android:paddingStart="12dp"
-                            android:paddingTop="12dp"
-                            android:paddingEnd="12dp"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"/>
-
-                    <LinearLayout
-
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
-
-                        <TextView
-                                android:id="@+id/a_me_username"
-                                android:drawablePadding="16dp"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text=""
-                                android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"/>
-
-                        <TextView
-                                android:id="@+id/a_me_email"
-                                android:drawablePadding="16dp"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text=""
-                                android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"/>
-
-                        <TextView
-                                android:drawablePadding="16dp"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/me_logout_button"
-                                android:id="@+id/a_me_logout"
-                                android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"/>
-
-
-                    </LinearLayout>
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="4dp"
-                    android:background="@android:color/darker_gray"/>
-
-            <LinearLayout
-                    android:id="@+id/a_me_playlist"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:layout_marginBottom="12dp"
-                    android:orientation="horizontal">
-
-                <TextView
-                        android:drawableStart="@drawable/ic_baseline_settings_24"
-                        android:drawablePadding="16dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/playlist"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"/>
-            </LinearLayout>
-
-            <LinearLayout
-                    android:id="@+id/a_me_settings"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:layout_marginBottom="12dp"
-                    android:orientation="horizontal">
-
-                <TextView
-                        android:drawableStart="@drawable/ic_baseline_settings_24"
-                        android:drawablePadding="16dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/title_activity_settings"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"/>
-            </LinearLayout>
-
-
-            <LinearLayout
-                    android:id="@+id/a_me_helpnfeedback"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:layout_marginBottom="12dp"
-                    android:orientation="horizontal">
-
-                <TextView
-                        android:drawableStart="@drawable/ic_baseline_help_24"
-                        android:drawablePadding="16dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/me_help_and_feedback_button"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"/>
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-    </ScrollView>
-
-
-    <!--    <LinearLayout-->
-    <!--        android:layout_marginBottom="0dp"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:orientation="vertical">-->
-
-    <!--        <androidx.appcompat.widget.AppCompatTextView-->
-    <!--            android:id="@+id/account_username"-->
-    <!--            android:layout_width="match_parent"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:text="" />-->
-
-    <!--        <androidx.appcompat.widget.AppCompatTextView-->
-    <!--            android:id="@+id/account_email"-->
-    <!--            android:layout_width="match_parent"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:text="" />-->
-    <!--    </LinearLayout>-->
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_playlist.xml b/app/src/main/res/layout/activity_playlist.xml
deleted file mode 100644
index 673e50e..0000000
--- a/app/src/main/res/layout/activity_playlist.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                     xmlns:tools="http://schemas.android.com/tools"
-                                                     android:layout_width="match_parent"
-                                                     android:layout_height="match_parent"
-                                                     tools:context=".activity.ServerAddressBookActivity"
-                                                     android:id="@+id/server_book">
-
-    <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar_server_address_book"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-                android:id="@+id/tool_bar_server_address_book"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|enterAlways"
-                android:elevation="4dp"/>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    >
-
-        <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/server_list_recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@android:color/darker_gray"
-                tools:listitem="@layout/row_playlist"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_server.xml b/app/src/main/res/layout/activity_search_server.xml
deleted file mode 100644
index 991e091..0000000
--- a/app/src/main/res/layout/activity_search_server.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activity.SearchServerActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_server_selection"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/tool_bar_server_selection"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:elevation="4dp"
-            app:layout_scrollFlags="scroll|enterAlways" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <TextView
-        android:id="@+id/empty_server_selection_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/no_data_available"
-        android:visibility="gone" />
-
-
-    <EditText
-        android:id="@+id/search_server_input_field"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/server_selection_filter_hint"
-        android:singleLine="true"
-        android:imeOptions="actionGo"/>
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/serversSwipeRefreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/serverRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    </LinearLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_server_address_book.xml b/app/src/main/res/layout/activity_server_address_book.xml
deleted file mode 100644
index d09f244..0000000
--- a/app/src/main/res/layout/activity_server_address_book.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activity.ServerAddressBookActivity"
-    android:id="@+id/server_book">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_server_address_book"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/tool_bar_server_address_book"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlways"
-            android:elevation="4dp" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/add_server"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@drawable/ic_baseline_add_24" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        >
-
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/server_list_recyclerview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/darker_gray"
-            tools:listitem="@layout/row_server_address_book"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            />
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
deleted file mode 100644
index 4fb6dcc..0000000
--- a/app/src/main/res/layout/activity_settings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_settings"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/tool_bar_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:elevation="4dp" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-        android:id="@+id/settings"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_video_list.xml b/app/src/main/res/layout/activity_video_list.xml
deleted file mode 100644
index 653327a..0000000
--- a/app/src/main/res/layout/activity_video_list.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="net.schueller.peertube.activity.VideoListActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/tool_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlways"
-            android:elevation="4dp" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <TextView
-        android:id="@+id/empty_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:visibility="gone"
-        android:text="@string/no_data_available" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/navigation"
-        android:layout_below="@+id/appbar"
-        android:layout_weight="1"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-           >
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/navigation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_gravity="bottom"
-        app:menu="@menu/menu_bottom_video_list"
-        android:background="?android:attr/windowBackground"
-        />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_video_play.xml b/app/src/main/res/layout/activity_video_play.xml
deleted file mode 100644
index fef0dd0..0000000
--- a/app/src/main/res/layout/activity_video_play.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:keepScreenOn="true"
-    tools:context="net.schueller.peertube.activity.VideoPlayActivity">
-
-    <RelativeLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <fragment
-            android:id="@+id/video_player_fragment"
-            android:name="net.schueller.peertube.fragment.VideoPlayerFragment"
-            android:layout_width="match_parent"
-            android:layout_height="250dp" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/video_player_fragment"
-        android:layout_marginTop="250dp"
-        android:orientation="vertical">
-
-    <fragment
-        android:id="@+id/video_meta_data_fragment"
-        android:name="net.schueller.peertube.fragment.VideoMetaDataFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-         />
-
-    </RelativeLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_add_server.xml b/app/src/main/res/layout/fragment_add_server.xml
deleted file mode 100644
index 91e0a6b..0000000
--- a/app/src/main/res/layout/fragment_add_server.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="16dp"
-    android:paddingTop="100dp"
-    android:paddingRight="16dp"
-    tools:context=".fragment.AddServerFragment"
-    android:background="?android:colorBackground">
-
-    <EditText
-        android:id="@+id/serverLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:hint="@string/server_book_add_label"
-        android:inputType="textPersonName" />
-
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:orientation="horizontal"
-        >
-
-        <EditText
-            android:id="@+id/serverUrl"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:hint="@string/server_book_add_server_url"
-            android:inputType="textUri"
-            />
-
-        <Button
-            android:id="@+id/pickServerUrl"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/server_book_add_pick_server_button" />
-
-    </LinearLayout>
-
-    <EditText
-        android:id="@+id/serverUsername"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:hint="@string/server_book_add_username"
-        android:inputType="textPersonName" />
-
-    <EditText
-        android:id="@+id/serverPassword"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:hint="@string/server_book_add_password"
-        android:inputType="textPassword" />
-
-<!--    <Button-->
-<!--        android:id="@+id/testServerButton"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:text="Test" />-->
-
-    <Button
-        android:id="@+id/addServerButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/server_book_add_add_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_description.xml b/app/src/main/res/layout/fragment_video_description.xml
deleted file mode 100644
index 0c6ba75..0000000
--- a/app/src/main/res/layout/fragment_video_description.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="?android:colorBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="12dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="12dp">
-
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:gravity="start"
-            android:text="@string/video_meta_title_description"
-            android:textSize="24sp" />
-
-        <ImageButton
-            android:id="@+id/video_description_close_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:width="24dp"
-            android:height="24dp"
-            android:background="@android:color/transparent"
-            android:gravity="end"
-            android:src="@drawable/ic_close"
-            app:tint="?attr/colorPrimary" />
-    </RelativeLayout>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="12dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="12dp">
-
-        <TextView
-
-            android:id="@+id/description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
-            android:autoLink="web"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/description"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:gravity="bottom"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/video_meta_button_privacy"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-                <Space
-                    android:layout_width="12dp"
-                    android:layout_height="1dp" />
-
-                <TextView
-                    android:id="@+id/video_privacy"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center|start"
-                    android:lines="2"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                    tools:text="@tools:sample/lorem/random" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:gravity="bottom"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/video_meta_button_category"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-                <Space
-                    android:layout_width="12dp"
-                    android:layout_height="1dp" />
-
-                <TextView
-                    android:id="@+id/video_category"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center|start"
-                    android:lines="2"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                    tools:text="@tools:sample/lorem/random" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:gravity="bottom"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/video_meta_button_license"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-                <Space
-                    android:layout_width="12dp"
-                    android:layout_height="1dp" />
-
-                <TextView
-                    android:id="@+id/video_license"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center|start"
-                    android:lines="2"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                    tools:text="@tools:sample/lorem" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:gravity="bottom"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/video_meta_button_language"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-                <Space
-                    android:layout_width="12dp"
-                    android:layout_height="1dp" />
-
-                <TextView
-                    android:id="@+id/video_language"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center|start"
-                    android:lines="2"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                    tools:text="@tools:sample/lorem/random" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:gravity="bottom"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/video_meta_button_tags"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-                <Space
-                    android:layout_width="12dp"
-                    android:layout_height="1dp" />
-
-                <TextView
-                    android:id="@+id/video_tags"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center|start"
-                    android:lines="2"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                    tools:text="@tools:sample/lorem/random" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-    </RelativeLayout>
-    </ScrollView>
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_video_meta.xml b/app/src/main/res/layout/fragment_video_meta.xml
deleted file mode 100644
index f90240d..0000000
--- a/app/src/main/res/layout/fragment_video_meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:id="@+id/videoMetaFragment"
-    android:layout_height="wrap_content">
-
-    <!-- Related Videos -->
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/relatedVideosView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    </androidx.recyclerview.widget.RecyclerView>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_options_popup_menu.xml b/app/src/main/res/layout/fragment_video_options_popup_menu.xml
deleted file mode 100644
index b6dd933..0000000
--- a/app/src/main/res/layout/fragment_video_options_popup_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:background="@color/videoBackgroundColor"
-    android:id="@+id/video_options_popup"
-    android:orientation="vertical">
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_options_quality_popup_menu.xml b/app/src/main/res/layout/fragment_video_options_quality_popup_menu.xml
deleted file mode 100644
index a9fa70c..0000000
--- a/app/src/main/res/layout/fragment_video_options_quality_popup_menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video_quality_menu"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:background="@color/videoBackgroundColor"
-    android:orientation="vertical">
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_options_speed_popup_menu.xml b/app/src/main/res/layout/fragment_video_options_speed_popup_menu.xml
deleted file mode 100644
index 7d0d3c7..0000000
--- a/app/src/main/res/layout/fragment_video_options_speed_popup_menu.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:background="@color/videoBackgroundColor"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/video_speed05_icon"
-            android:layout_width="32dp"
-            android:layout_height="56dp"
-            android:layout_marginStart="16dp"
-            android:gravity="center|start"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/video_speed05"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:gravity="center|start"
-            android:text="@string/video_speed_05"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/video_speed075_icon"
-            android:layout_width="32dp"
-            android:layout_height="56dp"
-            android:layout_marginStart="16dp"
-            android:gravity="center|start"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/video_speed075"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:gravity="center|start"
-            android:text="@string/video_speed_075"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/video_speed10_icon"
-            android:layout_width="32dp"
-            android:layout_height="56dp"
-            android:layout_marginStart="16dp"
-            android:gravity="center|start"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/video_speed10"
-
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:gravity="center|start"
-            android:text="@string/video_speed_10"
-            android:textAllCaps="false"
-
-            android:textColor="#ffffff"
-            android:textSize="16sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/video_speed125_icon"
-            android:layout_width="32dp"
-            android:layout_height="56dp"
-            android:layout_marginStart="16dp"
-            android:gravity="center|start"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/video_speed125"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:gravity="center|start"
-            android:text="@string/video_speed_125"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/video_speed15_icon"
-            android:layout_width="32dp"
-            android:layout_height="56dp"
-            android:layout_marginStart="16dp"
-            android:gravity="center|start"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/video_speed15"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:gravity="center|start"
-            android:text="@string/video_speed_15"
-            android:textAllCaps="false"
-
-            android:textColor="#ffffff"
-            android:textSize="16sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/video_speed20_icon"
-            android:layout_width="32dp"
-            android:layout_height="56dp"
-            android:layout_marginStart="16dp"
-            android:gravity="center|start"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/video_speed20"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:gravity="center|start"
-            android:text="@string/video_speed_20"
-            android:textAllCaps="false"
-
-            android:textColor="#ffffff"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_player.xml b/app/src/main/res/layout/fragment_video_player.xml
deleted file mode 100644
index cf0bd2a..0000000
--- a/app/src/main/res/layout/fragment_video_player.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.exoplayer2.ui.PlayerView
-        android:animateLayoutChanges="true"
-        android:id="@+id/video_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/videoBackgroundColor"
-        app:controller_layout_id="@layout/video_playback_controls"
-        app:resize_mode="fixed_width"
-        app:show_buffering="always"
-        />
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_category_title.xml b/app/src/main/res/layout/item_category_title.xml
deleted file mode 100644
index ea89c15..0000000
--- a/app/src/main/res/layout/item_category_title.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/text_view_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_channel_title.xml b/app/src/main/res/layout/item_channel_title.xml
deleted file mode 100644
index f05adf7..0000000
--- a/app/src/main/res/layout/item_channel_title.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/avatar"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
-
-    <TextView
-        android:id="@+id/text_view_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toRightOf="@+id/avatar"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_tag_title.xml b/app/src/main/res/layout/item_tag_title.xml
deleted file mode 100644
index ea89c15..0000000
--- a/app/src/main/res/layout/item_tag_title.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/text_view_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_video_comments_overview.xml b/app/src/main/res/layout/item_video_comments_overview.xml
deleted file mode 100644
index 885dc83..0000000
--- a/app/src/main/res/layout/item_video_comments_overview.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="6dp"
-        android:padding="6dp"
-        android:id="@+id/video_title_block"
-        >
-
-        <RelativeLayout
-            android:id="@+id/video_comments_title_wrapper"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/video_comments_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_centerInParent="true"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="0dp"
-                android:layout_marginTop="6dp"
-                android:text="@string/video_comments_title"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-
-            <TextView
-                android:id="@+id/video_comments_total_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginStart="6dp"
-                android:layout_marginTop="6dp"
-                android:layout_marginEnd="24dp"
-                android:layout_toEndOf="@+id/video_comments_title"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-            <ImageButton
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:background="@android:color/transparent"
-                android:clickable="false"
-                android:contentDescription="@string/video_meta_show_description"
-                android:src="@drawable/ic_chevron_down"
-                app:tint="?attr/colorPrimary" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/video_highlighted_comment_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/video_comments_title_wrapper">
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/video_highlighted_avatar"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/video_highlighted_comment"
-                android:layout_toEndOf="@+id/video_highlighted_avatar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="6dp"
-                android:textSize="12sp"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="6dp"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_video_meta.xml b/app/src/main/res/layout/item_video_meta.xml
deleted file mode 100644
index e15f7e5..0000000
--- a/app/src/main/res/layout/item_video_meta.xml
+++ /dev/null
@@ -1,412 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:layout_height="wrap_content"
-         android:layout_width="match_parent">
-
-        <!-- Video Title Block -->
-        <RelativeLayout
-            android:background="?android:selectableItemBackground"
-            android:id="@+id/video_title_block"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="6dp"
-            android:paddingTop="6dp">
-
-            <RelativeLayout
-                android:id="@+id/video_open_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
-                android:layout_marginEnd="6dp">
-
-                <TextView
-                    android:id="@+id/video_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="0dp"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginEnd="24dp"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Title" />
-
-                <ImageButton
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:contentDescription="@string/video_meta_show_description"
-                    android:src="@drawable/ic_chevron_down"
-                    app:tint="?attr/colorPrimary" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/videoMeta"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/video_open_description"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="6dp"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="6dp"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-        </RelativeLayout>
-
-        <!-- video actions -->
-        <HorizontalScrollView
-            android:id="@+id/video_actions_block"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/video_title_block"
-            android:paddingBottom="6dp"
-            android:scrollbars="none">
-
-            <LinearLayout
-                android:id="@+id/video_actions"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:layout_marginEnd="18dp"
-                android:paddingEnd="18dp"
-                android:paddingStart="18dp"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="70dp"
-                    android:id="@+id/video_thumbs_up_wrapper"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <ImageButton
-                        android:id="@+id/video_thumbs_up"
-                        android:layout_width="42dp"
-                        android:layout_height="42dp"
-                        android:layout_gravity="center"
-                        android:background="?android:selectableItemBackground"
-                        android:gravity="center"
-                        android:clickable="false"
-                        android:src="@drawable/ic_thumbs_up"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:id="@+id/video_thumbs_up_total"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
-                <LinearLayout
-                    android:layout_width="70dp"
-                    android:id="@+id/video_thumbs_down_wrapper"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <ImageButton
-                        android:id="@+id/video_thumbs_down"
-                        android:layout_width="42dp"
-                        android:layout_height="42dp"
-                        android:layout_gravity="center"
-                        android:background="?android:selectableItemBackground"
-                        android:gravity="center"
-                        android:clickable="false"
-                        android:src="@drawable/ic_thumbs_down"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:id="@+id/video_thumbs_down_total"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
-                <LinearLayout
-                    android:layout_width="70dp"
-                    android:id="@+id/video_share_wrapper"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <ImageButton
-                        android:id="@+id/video_share"
-                        android:layout_width="42dp"
-                        android:layout_height="42dp"
-                        android:layout_gravity="center"
-                        android:background="?android:selectableItemBackground"
-                        android:gravity="center"
-                        android:clickable="false"
-                        android:src="@drawable/ic_share_2"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:id="@+id/video_share_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="@string/video_meta_button_share"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
-                <LinearLayout
-                    android:layout_width="70dp"
-                    android:id="@+id/video_download_wrapper"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <ImageButton
-                        android:id="@+id/video_download"
-                        android:layout_width="42dp"
-                        android:layout_height="42dp"
-                        android:layout_gravity="center"
-                        android:background="?android:selectableItemBackground"
-                        android:gravity="center"
-                        android:clickable="false"
-                        android:src="@drawable/ic_download"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:id="@+id/video_download_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="@string/video_meta_button_download"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
-                <LinearLayout
-                    android:layout_width="70dp"
-                    android:id="@+id/video_add_to_playlist_wrapper"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <ImageButton
-                        android:id="@+id/video_add_to_playlist"
-                        android:layout_width="42dp"
-                        android:layout_height="42dp"
-                        android:layout_gravity="center"
-                        android:background="?android:selectableItemBackground"
-                        android:gravity="center"
-                        android:clickable="false"
-                        android:src="@drawable/ic_playlist_add"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:id="@+id/video_add_to_playlist_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="@string/video_add_to_playlist"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
-                <LinearLayout
-                    android:layout_width="70dp"
-                    android:id="@+id/video_block_wrapper"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <ImageButton
-                        android:id="@+id/video_block"
-                        android:layout_width="42dp"
-                        android:layout_height="42dp"
-                        android:layout_gravity="center"
-                        android:background="?android:selectableItemBackground"
-                        android:gravity="center"
-                        android:clickable="false"
-                        android:src="@drawable/ic_slash"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:id="@+id/vvideo_block_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="@string/video_block"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
-                <LinearLayout
-                    android:layout_width="70dp"
-                    android:id="@+id/video_flag_wrapper"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <ImageButton
-                        android:id="@+id/video_flag"
-                        android:layout_width="42dp"
-                        android:layout_height="42dp"
-                        android:layout_gravity="center"
-                        android:background="?android:selectableItemBackground"
-                        android:gravity="center"
-                        android:clickable="false"
-                        android:src="@drawable/ic_flag"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:id="@+id/vvideo_flag_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="@string/video_flag"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-        </HorizontalScrollView>
-
-        <TextView
-            android:layout_below="@+id/video_actions_block"
-            android:id="@+id/video_action_block_line"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:background="?android:colorEdgeEffect"
-            android:height="1dp"
-            android:gravity="center_horizontal"/>
-
-        <RelativeLayout
-            android:id="@+id/video_account_block"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/video_action_block_line"
-            android:paddingStart="12dp"
-            android:paddingTop="6dp"
-            android:paddingEnd="6dp">
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/avatar"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:contentDescription="@string/video_row_account_avatar"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp" />
-
-            <LinearLayout
-                android:id="@+id/video_creator_info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="6dp"
-                android:layout_toEndOf="@+id/avatar"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/videoOwner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-                <TextView
-                    android:id="@+id/videoBy"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="3dp"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-                <TextView
-                    android:id="@+id/videoOwnerSubscribers"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="3dp"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/videoOwnerSubscribeButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="0dp"
-                android:gravity="end"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp"
-                android:text=""
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Button" />
-
-
-            <!--        <TextView-->
-            <!--            android:id="@+id/moreButton"-->
-            <!--            android:layout_width="45dp"-->
-            <!--            android:layout_height="45dp"-->
-            <!--            android:layout_marginStart="-16dp"-->
-            <!--            android:layout_marginTop="16dp"-->
-            <!--            android:layout_marginEnd="0dp"-->
-            <!--            android:layout_toEndOf="@+id/sl_row_name"-->
-            <!--            android:background="@null"-->
-            <!--            android:contentDescription="@string/descr_overflow_button"-->
-            <!--            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />-->
-
-        </RelativeLayout>
-
-        <TextView
-            android:layout_below="@+id/video_account_block"
-            android:id="@+id/video_account_block_line"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:background="?android:colorEdgeEffect"
-            android:height="1dp"
-            android:gravity="center_horizontal"/>
-    </RelativeLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_account_about.xml b/app/src/main/res/layout/row_account_about.xml
deleted file mode 100644
index 11ccc62..0000000
--- a/app/src/main/res/layout/row_account_about.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- START*** Root Container *** -->
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardElevation="0dp"
-    card_view:cardUseCompatPadding="true">
-
-    <RelativeLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="12dp">
-
-
-        <ImageView
-            android:id="@+id/thumb"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/video_row_video_thumbnail"
-            android:maxHeight="300dp"
-            android:scaleType="fitXY" />
-
-            <TextView
-                android:paddingStart="4dp"
-                android:paddingEnd="4dp"
-                android:layout_margin="2dp"
-                android:text=""
-                android:layout_above="@+id/avatar"
-                android:gravity="bottom|end"
-                android:layout_alignParentEnd="true"
-                android:id="@+id/video_duration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/durationTextColor"
-                android:background="@color/durationBackgroundColor"/>
-
-        <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/avatar"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_below="@+id/thumb"
-            android:layout_alignParentStart="true"
-            android:layout_marginTop="0dp"
-            android:contentDescription="@string/video_row_account_avatar"
-            android:paddingStart="12dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="12dp" />
-
-        <TextView
-            android:id="@+id/sl_row_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/thumb"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="12dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:layout_marginEnd="24dp"
-
-            android:paddingTop="0dp"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-        <TextView
-            android:id="@+id/videoMeta"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/sl_row_name"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-        <TextView
-            android:id="@+id/videoOwner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/videoMeta"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-        <TextView
-            android:id="@+id/moreButton"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_below="@+id/thumb"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="-16dp"
-            android:layout_marginEnd="0dp"
-            android:layout_toEndOf="@+id/sl_row_name"
-            android:background="@null"
-            android:contentDescription="@string/descr_overflow_button"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-    </RelativeLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/row_account_channels.xml b/app/src/main/res/layout/row_account_channels.xml
deleted file mode 100644
index 11ccc62..0000000
--- a/app/src/main/res/layout/row_account_channels.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- START*** Root Container *** -->
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardElevation="0dp"
-    card_view:cardUseCompatPadding="true">
-
-    <RelativeLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="12dp">
-
-
-        <ImageView
-            android:id="@+id/thumb"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/video_row_video_thumbnail"
-            android:maxHeight="300dp"
-            android:scaleType="fitXY" />
-
-            <TextView
-                android:paddingStart="4dp"
-                android:paddingEnd="4dp"
-                android:layout_margin="2dp"
-                android:text=""
-                android:layout_above="@+id/avatar"
-                android:gravity="bottom|end"
-                android:layout_alignParentEnd="true"
-                android:id="@+id/video_duration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/durationTextColor"
-                android:background="@color/durationBackgroundColor"/>
-
-        <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/avatar"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_below="@+id/thumb"
-            android:layout_alignParentStart="true"
-            android:layout_marginTop="0dp"
-            android:contentDescription="@string/video_row_account_avatar"
-            android:paddingStart="12dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="12dp" />
-
-        <TextView
-            android:id="@+id/sl_row_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/thumb"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="12dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:layout_marginEnd="24dp"
-
-            android:paddingTop="0dp"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-        <TextView
-            android:id="@+id/videoMeta"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/sl_row_name"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-        <TextView
-            android:id="@+id/videoOwner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/videoMeta"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-        <TextView
-            android:id="@+id/moreButton"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_below="@+id/thumb"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="-16dp"
-            android:layout_marginEnd="0dp"
-            android:layout_toEndOf="@+id/sl_row_name"
-            android:background="@null"
-            android:contentDescription="@string/descr_overflow_button"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-    </RelativeLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/row_account_video.xml b/app/src/main/res/layout/row_account_video.xml
deleted file mode 100644
index 11ccc62..0000000
--- a/app/src/main/res/layout/row_account_video.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- START*** Root Container *** -->
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardElevation="0dp"
-    card_view:cardUseCompatPadding="true">
-
-    <RelativeLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="12dp">
-
-
-        <ImageView
-            android:id="@+id/thumb"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/video_row_video_thumbnail"
-            android:maxHeight="300dp"
-            android:scaleType="fitXY" />
-
-            <TextView
-                android:paddingStart="4dp"
-                android:paddingEnd="4dp"
-                android:layout_margin="2dp"
-                android:text=""
-                android:layout_above="@+id/avatar"
-                android:gravity="bottom|end"
-                android:layout_alignParentEnd="true"
-                android:id="@+id/video_duration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/durationTextColor"
-                android:background="@color/durationBackgroundColor"/>
-
-        <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/avatar"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_below="@+id/thumb"
-            android:layout_alignParentStart="true"
-            android:layout_marginTop="0dp"
-            android:contentDescription="@string/video_row_account_avatar"
-            android:paddingStart="12dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="12dp" />
-
-        <TextView
-            android:id="@+id/sl_row_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/thumb"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="12dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:layout_marginEnd="24dp"
-
-            android:paddingTop="0dp"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-        <TextView
-            android:id="@+id/videoMeta"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/sl_row_name"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-        <TextView
-            android:id="@+id/videoOwner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/videoMeta"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-        <TextView
-            android:id="@+id/moreButton"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_below="@+id/thumb"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="-16dp"
-            android:layout_marginEnd="0dp"
-            android:layout_toEndOf="@+id/sl_row_name"
-            android:background="@null"
-            android:contentDescription="@string/descr_overflow_button"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-    </RelativeLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/row_playlist.xml b/app/src/main/res/layout/row_playlist.xml
deleted file mode 100644
index 1aa40c0..0000000
--- a/app/src/main/res/layout/row_playlist.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:focusable="true"
-        card_view:cardCornerRadius="0dp"
-        card_view:cardElevation="0dp"
-        card_view:cardUseCompatPadding="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:padding="12dp">
-
-        <TextView
-                android:id="@+id/video_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                card_view:layout_constraintTop_toTopOf="parent"
-                card_view:layout_constraintStart_toStartOf="parent"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
-                tools:text="@tools:sample/lorem"
-        />
-
-        <TextView
-                android:id="@+id/video_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="2"
-                android:ellipsize="end"
-                card_view:layout_constraintTop_toBottomOf="@id/video_name"
-                card_view:layout_constraintStart_toStartOf="parent"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead"
-                tools:text="@tools:sample/lorem"
-        />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_popup_menu.xml b/app/src/main/res/layout/row_popup_menu.xml
deleted file mode 100644
index 8906d5b..0000000
--- a/app/src/main/res/layout/row_popup_menu.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:id="@+id/video_quality_icon"
-        android:layout_width="32dp"
-        android:layout_height="56dp"
-        android:layout_marginStart="16dp"
-        android:gravity="center|start"
-        android:textAllCaps="false"
-        android:textColor="#ffffff"
-        android:textSize="12sp" />
-
-    <TextView
-        android:id="@+id/video_quality_text"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center|start"
-        android:text=""
-        android:textAllCaps="false"
-        android:textColor="#ffffff"
-        android:textSize="16sp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_search_server.xml b/app/src/main/res/layout/row_search_server.xml
deleted file mode 100644
index 6ae2f7f..0000000
--- a/app/src/main/res/layout/row_search_server.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- START*** Root Container *** -->
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardElevation="0dp"
-    card_view:cardUseCompatPadding="true">
-
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:padding="12dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/sl_row_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="24dp"
-            android:paddingTop="0dp"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline" />
-
-        <TextView
-            android:id="@+id/sl_row_host"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="24dp"
-            android:paddingTop="0dp"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-        <TextView
-            android:id="@+id/sl_row_signup_allowed"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="24dp"
-            android:paddingTop="0dp"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-
-        <TextView
-            android:id="@+id/sl_row_short_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="24dp"
-            android:paddingTop="0dp"
-            android:visibility="gone"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="0dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="24dp"
-            android:orientation="horizontal">
-
-
-            <TextView
-                android:id="@+id/sl_row_video_totals"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-        <ImageView
-            android:id="@+id/sl_row_is_nsfw"
-            android:src="@drawable/ic_baseline_remove_red_eye_24"
-            android:visibility="gone"
-            android:layout_width="24dp"
-
-            android:layout_alignParentEnd="true"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/server_selection_nsfw_instance" />
-
-    </RelativeLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/row_server_address_book.xml b/app/src/main/res/layout/row_server_address_book.xml
deleted file mode 100644
index 7c935cf..0000000
--- a/app/src/main/res/layout/row_server_address_book.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:focusable="true"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardElevation="0dp"
-    card_view:cardUseCompatPadding="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:padding="12dp">
-
-        <TextView
-            android:id="@+id/serverLabelRow"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            card_view:layout_constraintTop_toTopOf="parent"
-            card_view:layout_constraintStart_toStartOf="parent"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline"
-            tools:text="@tools:sample/lorem"
-            />
-
-        <TextView
-            android:id="@+id/serverUrlRow"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            card_view:layout_constraintTop_toBottomOf="@id/serverLabelRow"
-            card_view:layout_constraintStart_toStartOf="parent"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead"
-            tools:text="@tools:sample/lorem"
-            />
-
-        <ImageView
-            android:id="@+id/sb_row_has_login_icon"
-            android:layout_width="24dp"
-            android:layout_height="wrap_content"
-            card_view:layout_constraintTop_toTopOf="parent"
-            card_view:layout_constraintEnd_toEndOf="parent"
-            android:contentDescription="@string/server_book_list_has_login"
-            android:src="@drawable/ic_baseline_account_circle_24"
-            />
-
-        <ImageView
-            android:id="@+id/edit_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            card_view:layout_constraintTop_toBottomOf="@id/sb_row_has_login_icon"
-            card_view:layout_constraintEnd_toEndOf="parent"
-            card_view:layout_constraintBottom_toBottomOf="parent"
-            android:contentDescription="@string/server_book_list_has_login"
-            android:src="@drawable/ic_edit_24"
-            />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_video_list.xml b/app/src/main/res/layout/row_video_list.xml
deleted file mode 100644
index d2affc9..0000000
--- a/app/src/main/res/layout/row_video_list.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- START*** Root Container *** -->
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:focusable="true"
-    card_view:cardCornerRadius="0dp"
-    card_view:cardElevation="0dp"
-    card_view:contentPadding="0dp"
-    card_view:cardPreventCornerOverlap="false"
-    card_view:cardUseCompatPadding="false">
-
-    <RelativeLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="0dp"
-        android:paddingRight="0dp"
-        android:paddingLeft="0dp"
-        android:paddingBottom="8dp">
-
-
-        <ImageView
-            android:id="@+id/thumb"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/video_row_video_thumbnail"
-            android:maxHeight="300dp"
-            android:scaleType="fitXY" />
-
-            <TextView
-                android:textSize="12sp"
-                android:paddingStart="4dp"
-                android:paddingEnd="4dp"
-                android:layout_margin="2dp"
-                android:text=""
-                android:layout_above="@+id/avatar"
-                android:gravity="bottom|end"
-                android:layout_alignParentEnd="true"
-                android:id="@+id/video_duration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/durationTextColor"
-                android:background="@color/durationBackgroundColor"/>
-
-        <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/avatar"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_below="@+id/thumb"
-            android:layout_alignParentStart="true"
-            android:layout_marginTop="0dp"
-            android:contentDescription="@string/video_row_account_avatar"
-            android:paddingStart="12dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="12dp" />
-
-        <TextView
-            android:id="@+id/sl_row_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/thumb"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="12dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:layout_marginEnd="24dp"
-
-            android:paddingTop="0dp"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-        <TextView
-            android:id="@+id/videoMeta"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/sl_row_name"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@+id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-        <TextView
-            android:id="@+id/videoOwner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/videoMeta"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_toEndOf="@id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-        <TextView
-            android:id="@+id/moreButton"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_below="@+id/thumb"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="-16dp"
-            android:layout_marginEnd="0dp"
-            android:layout_toEndOf="@+id/sl_row_name"
-            android:background="@null"
-            android:contentDescription="@string/descr_overflow_button"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-            />
-
-    </RelativeLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/menu/menu_bottom_account.xml b/app/src/main/res/menu/menu_bottom_account.xml
deleted file mode 100644
index a286168..0000000
--- a/app/src/main/res/menu/menu_bottom_account.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/account_navigation_videos"
-        android:title="@string/account_bottom_menu_videos"
-        app:showAsAction="ifRoom|withText"/>
-
-    <item
-        android:id="@+id/account_navigation_channels"
-        android:title="@string/account_bottom_menu_channels"
-        app:showAsAction="always|withText"/>
-
-    <item
-        android:id="@+id/account_navigation_about"
-        android:title="@string/account_bottom_menu_about"
-        app:showAsAction="always|withText" />
-
-</menu>
diff --git a/app/src/main/res/menu/menu_bottom_video_list.xml b/app/src/main/res/menu/menu_bottom_video_list.xml
deleted file mode 100644
index 18a644f..0000000
--- a/app/src/main/res/menu/menu_bottom_video_list.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/navigation_overview"
-        android:title="@string/bottom_nav_title_discover"
-        app:showAsAction="always|withText" />
-
-    <item
-        android:id="@+id/navigation_trending"
-        android:title="@string/bottom_nav_title_trending"
-        app:showAsAction="always|withText"/>
-
-    <item
-        android:id="@+id/navigation_recent"
-        android:title="@string/bottom_nav_title_recent"
-        app:showAsAction="ifRoom|withText" />
-
-    <item
-        android:id="@+id/navigation_local"
-        android:title="@string/bottom_nav_title_local"
-        app:showAsAction="ifRoom|withText"/>
-
-    <item
-        android:id="@+id/navigation_subscriptions"
-        android:title="@string/bottom_nav_title_subscriptions"
-        app:showAsAction="ifRoom|withText"/>
-
-    <!--<item-->
-        <!--android:id="@+id/navigation_account"-->
-        <!--android:title="@string/bottom_nav_title_account"-->
-        <!--app:showAsAction="ifRoom|withText"/>-->
-
-</menu>
diff --git a/app/src/main/res/menu/menu_top_account.xml b/app/src/main/res/menu/menu_top_account.xml
deleted file mode 100644
index 4238d67..0000000
--- a/app/src/main/res/menu/menu_top_account.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="activity.VideoListActivity">
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_top_videolist.xml b/app/src/main/res/menu/menu_top_videolist.xml
deleted file mode 100644
index 48c03a6..0000000
--- a/app/src/main/res/menu/menu_top_videolist.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="activity.VideoListActivity">
-
-    <item
-        android:id="@+id/action_search"
-        android:orderInCategory="300"
-        android:title="@string/action_bar_title_search"
-        app:showAsAction="always|collapseActionView"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-        app:actionViewClass="androidx.appcompat.widget.SearchView" />
-
-
-    <item
-        android:id="@+id/action_server_address_book"
-        android:orderInCategory="300"
-        android:title="@string/action_bar_title_address_book"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-        app:showAsAction="ifRoom" />
-
-
-    <item
-        android:id="@+id/action_account"
-        android:orderInCategory="300"
-        android:title="@string/action_bar_title_account"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-        app:showAsAction="ifRoom" />
-
-    <!--<item-->
-        <!--android:id="@+id/action_server_selection"-->
-        <!--android:orderInCategory="300"-->
-        <!--android:title="@string/action_bar_title_server_selection"-->
-        <!--android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"-->
-        <!--app:showAsAction="ifRoom" />-->
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_video_more.xml b/app/src/main/res/menu/menu_video_more.xml
deleted file mode 100644
index 0597d63..0000000
--- a/app/src/main/res/menu/menu_video_more.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/video_more_report"
-        android:title="@string/menu_video_more_report" />
-    <item
-        android:id="@+id/video_more_blacklist"
-        android:title="@string/menu_video_more_blacklist" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_video_play_options.xml b/app/src/main/res/menu/menu_video_play_options.xml
deleted file mode 100644
index 0af63ab..0000000
--- a/app/src/main/res/menu/menu_video_play_options.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_video_playback_speed"
-        android:icon="@drawable/ic_action_share"
-        android:title="@string/menu_share" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_video_row_mode.xml b/app/src/main/res/menu/menu_video_row_mode.xml
deleted file mode 100644
index cac5ba5..0000000
--- a/app/src/main/res/menu/menu_video_row_mode.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_share"
-        android:icon="@drawable/ic_action_share"
-        android:title="@string/menu_share" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
deleted file mode 100644
index 21529c2..0000000
--- a/app/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <attr name="metaButtonBarStyle" format="reference" />
-    <attr name="metaButtonBarButtonStyle" format="reference" />
-
-</resources>
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
deleted file mode 100644
index 5c3eb17..0000000
--- a/app/src/main/res/values/constants.xml
+++ /dev/null
@@ -1,604 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name" translatable="false">Thorium</string>
-
-    <!-- Prefs Settings-->
-    <string name="pref_language_app_key" translatable="false">pref_language_app</string>
-    <string name="pref_theme_key" translatable="false">pref_theme</string>
-    <string name="pref_dark_mode_key" translatable="false">pref_dark_mode</string>
-
-    <string name="pref_show_nsfw_key" translatable="false">pref_show_nsfw</string>
-    <string name="pref_video_language_key" translatable="false">pref_language</string>
-
-    <string name="pref_video_speed_key" translatable="false">pref_video_speed</string>
-    <string name="pref_back_pause_key" translatable="false">pref_back_pause</string>
-    <string name="pref_background_behavior_key" translatable="false">pref_background_behavior</string>
-    <string name="pref_torrent_player_key" translatable="false">pref_torrent_player</string>
-
-    <string name="pref_accept_insecure" translatable="false">pref_accept_insecure</string>
-
-    <string name ="pref_clear_history_key" translatable="false">pref_clear_history</string>
-    <!-- defaults -->
-    <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
-    <string name="app_default_theme" translatable="false">AppTheme.BLUE</string>
-
-    <!-- Pref internal -->
-    <string name="pref_token_access" translatable="false">pref_token_access</string>
-    <string name="pref_token_refresh" translatable="false">pref_token_refresh</string>
-    <string name="pref_token_expiration" translatable="false">pref_token_expiration</string>
-    <string name="pref_token_type" translatable="false">pref_token_type</string>
-    <string name="pref_auth_username" translatable="false">pref_auth_username</string>
-    <string name="pref_auth_password" translatable="false">pref_auth_password</string>
-    <string name="pref_client_id" translatable="false">pref_client_id</string>
-    <string name="pref_client_secret" translatable="false">pref_client_secret</string>
-    <string name="pref_api_base_key" translatable="false">pref_api_base</string>
-    <string name="pref_quality_key" translatable="false">pref_quality</string>
-
-    <!-- Pref internal keys -->
-    <string name="pref_background_audio_key" translatable="false">backgroundAudio</string>
-    <string name="pref_background_stop_key" translatable="false">backgroundStop</string>
-    <string name="pref_background_float_key" translatable="false">backgroundFloat</string>
-
-
-    <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
-
-    <string name="app_background_audio" translatable="false">BACKGROUND_AUDIO</string>
-
-    <string name="video_option_speed_icon" translatable="false">{faw-play-circle}</string>
-    <string name="video_option_quality_icon" translatable="false">{faw-cog}</string>
-    <string name="video_speed_active_icon" translatable="false">{faw-check}</string>
-    <string name="video_quality_active_icon" translatable="false">{faw-check}</string>
-    <string name="video_expand_icon" translatable="false">{faw-expand}</string>
-    <string name="video_compress_icon" translatable="false">{faw-compress}</string>
-    <string name="video_more_icon" translatable="false">{faw-ellipsis-v}</string>
-    <string name="video_thumbs_up_icon" translatable="false">{faw-thumbs-up}</string>
-    <string name="video_thumbs_down_icon" translatable="false">{faw-thumbs-down}</string>
-    <string name="video_share_icon" translatable="false">{faw-share}</string>
-    <string name="video_download_icon" translatable="false">{faw-download}</string>
-    <string name="video_save_icon" translatable="false">{faw-save}</string>
-
-    <string name="meta_data_seperator" translatable="false">\u0020-\u0020</string>
-
-    <string name="title_activity_video_play" translatable="false">VideoPlayActivity</string>
-
-    <string name="playback_channel_name" translatable="false">PeerTube</string>
-    <string name="playback_channel_description" translatable="false">playback_channel</string>
-
-    <string name="peertube_instance_search_default_description" translatable="false">PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.</string>
-
-    <string-array name="backgroundBehavior">
-        <item>@string/pref_background_audio</item>
-        <item>@string/pref_background_stop</item>
-        <item>@string/pref_background_float</item>
-    </string-array>
-
-    <string-array name="backgroundBehaviorValues">
-        <item>@string/pref_background_audio_key</item>
-        <item>@string/pref_background_stop_key</item>
-        <item>@string/pref_background_float_key</item>
-    </string-array>
-
-    <string-array name="themeArray">
-        <item>@string/red</item>
-        <item>@string/pink</item>
-        <item>@string/purple</item>
-        <item>@string/deeppurple</item>
-        <item>@string/indigo</item>
-        <item>@string/blue</item>
-        <item>@string/lightblue</item>
-        <item>@string/cyan</item>
-        <item>@string/teal</item>
-        <item>@string/green</item>
-        <item>@string/lightgreen</item>
-        <item>@string/lime</item>
-        <item>@string/yellow</item>
-        <item>@string/amber</item>
-        <item>@string/orange</item>
-        <item>@string/deeporange</item>
-        <item>@string/brown</item>
-        <item>@string/gray</item>
-        <item>@string/bluegray</item>
-    </string-array>
-
-    <string-array name="themeValues">
-        <item>AppTheme.RED</item>
-        <item>AppTheme.PINK</item>
-        <item>AppTheme.PURPLE</item>
-        <item>AppTheme.DEEPPURPLE</item>
-        <item>AppTheme.INDIGO</item>
-        <item>AppTheme.BLUE</item>
-        <item>AppTheme.LIGHTBLUE</item>
-        <item>AppTheme.CYAN</item>
-        <item>AppTheme.TEAL</item>
-        <item>AppTheme.GREEN</item>
-        <item>AppTheme.LIGHTGREEN</item>
-        <item>AppTheme.LIME</item>
-        <item>AppTheme.YELLOW</item>
-        <item>AppTheme.AMBER</item>
-        <item>AppTheme.ORANGE</item>
-        <item>AppTheme.DEEPORANGE</item>
-        <item>AppTheme.BROWN</item>
-        <item>AppTheme.GRAY</item>
-        <item>AppTheme.BLUEGRAY</item>
-    </string-array>
-    <string-array name="languageArray">
-        <item>@string/ab</item>
-        <item>@string/aa</item>
-        <item>@string/af</item>
-        <item>@string/ak</item>
-        <item>@string/sq</item>
-        <item>@string/ase</item>
-        <item>@string/am</item>
-        <item>@string/ar</item>
-        <item>@string/an</item>
-        <item>@string/hy</item>
-        <item>@string/as</item>
-        <item>@string/av</item>
-        <item>@string/ay</item>
-        <item>@string/az</item>
-        <item>@string/bm</item>
-        <item>@string/ba</item>
-        <item>@string/eu</item>
-        <item>@string/be</item>
-        <item>@string/bn</item>
-        <item>@string/bn_rBD</item>
-        <item>@string/bi</item>
-        <item>@string/bs</item>
-        <item>@string/bzs</item>
-        <item>@string/br</item>
-        <item>@string/bfi</item>
-        <item>@string/bg</item>
-        <item>@string/my</item>
-        <item>@string/ca</item>
-        <item>@string/ch</item>
-        <item>@string/ce</item>
-        <item>@string/zh</item>
-        <item>@string/csl</item>
-        <item>@string/cv</item>
-        <item>@string/kw</item>
-        <item>@string/co</item>
-        <item>@string/cr</item>
-        <item>@string/hr</item>
-        <item>@string/cs</item>
-        <item>@string/cse</item>
-        <item>@string/da</item>
-        <item>@string/dsl</item>
-        <item>@string/dv</item>
-        <item>@string/nl</item>
-        <item>@string/dz</item>
-        <item>@string/en</item>
-        <item>@string/eo</item>
-        <item>@string/et</item>
-        <item>@string/ee</item>
-        <item>@string/fo</item>
-        <item>@string/fj</item>
-        <item>@string/fi</item>
-        <item>@string/fr</item>
-        <item>@string/fsl</item>
-        <item>@string/ff</item>
-        <item>@string/gl</item>
-        <item>@string/lg</item>
-        <item>@string/ka</item>
-        <item>@string/de</item>
-        <item>@string/gsg</item>
-        <item>@string/gn</item>
-        <item>@string/gu</item>
-        <item>@string/ht</item>
-        <item>@string/ha</item>
-        <item>@string/he</item>
-        <item>@string/hz</item>
-        <item>@string/hi</item>
-        <item>@string/ho</item>
-        <item>@string/hu</item>
-        <item>@string/is</item>
-        <item>@string/ig</item>
-        <item>@string/id</item>
-        <item>@string/iu</item>
-        <item>@string/ik</item>
-        <item>@string/ga</item>
-        <item>@string/it</item>
-        <item>@string/ja</item>
-        <item>@string/jsl</item>
-        <item>@string/jv</item>
-        <item>@string/kl</item>
-        <item>@string/kn</item>
-        <item>@string/kr</item>
-        <item>@string/ks</item>
-        <item>@string/kk</item>
-        <item>@string/km</item>
-        <item>@string/ki</item>
-        <item>@string/rw</item>
-        <item>@string/ky</item>
-        <item>@string/tlh</item>
-        <item>@string/kv</item>
-        <item>@string/kg</item>
-        <item>@string/ko</item>
-        <item>@string/avk</item>
-        <item>@string/kj</item>
-        <item>@string/ku</item>
-        <item>@string/lo</item>
-        <item>@string/lv</item>
-        <item>@string/li</item>
-        <item>@string/ln</item>
-        <item>@string/lt</item>
-        <item>@string/jbo</item>
-        <item>@string/lu</item>
-        <item>@string/lb</item>
-        <item>@string/mk</item>
-        <item>@string/mg</item>
-        <item>@string/ms</item>
-        <item>@string/ml</item>
-        <item>@string/mt</item>
-        <item>@string/gv</item>
-        <item>@string/mi</item>
-        <item>@string/mr</item>
-        <item>@string/mh</item>
-        <item>@string/el</item>
-        <item>@string/mn</item>
-        <item>@string/na</item>
-        <item>@string/nv</item>
-        <item>@string/ng</item>
-        <item>@string/ne</item>
-        <item>@string/nd</item>
-        <item>@string/se</item>
-        <item>@string/no</item>
-        <item>@string/nb</item>
-        <item>@string/nn</item>
-        <item>@string/ny</item>
-        <item>@string/oc</item>
-        <item>@string/oj</item>
-        <item>@string/or</item>
-        <item>@string/om</item>
-        <item>@string/os</item>
-        <item>@string/pks</item>
-        <item>@string/pa</item>
-        <item>@string/fa</item>
-        <item>@string/pl</item>
-        <item>@string/pt</item>
-        <item>@string/ps</item>
-        <item>@string/qu</item>
-        <item>@string/ro</item>
-        <item>@string/rm</item>
-        <item>@string/rn</item>
-        <item>@string/ru</item>
-        <item>@string/rsl</item>
-        <item>@string/sm</item>
-        <item>@string/sg</item>
-        <item>@string/sc</item>
-        <item>@string/sdl</item>
-        <item>@string/gd</item>
-        <item>@string/sr</item>
-        <item>@string/sh</item>
-        <item>@string/sn</item>
-        <item>@string/ii</item>
-        <item>@string/sd</item>
-        <item>@string/si</item>
-        <item>@string/sk</item>
-        <item>@string/sl</item>
-        <item>@string/so</item>
-        <item>@string/sfs</item>
-        <item>@string/nr</item>
-        <item>@string/st</item>
-        <item>@string/es</item>
-        <item>@string/su</item>
-        <item>@string/sw</item>
-        <item>@string/ss</item>
-        <item>@string/sv</item>
-        <item>@string/swl</item>
-        <item>@string/tl</item>
-        <item>@string/ty</item>
-        <item>@string/tg</item>
-        <item>@string/ta</item>
-        <item>@string/tt</item>
-        <item>@string/te</item>
-        <item>@string/th</item>
-        <item>@string/bo</item>
-        <item>@string/ti</item>
-        <item>@string/to</item>
-        <item>@string/ts</item>
-        <item>@string/tn</item>
-        <item>@string/tr</item>
-        <item>@string/tk</item>
-        <item>@string/tw</item>
-        <item>@string/ug</item>
-        <item>@string/uk</item>
-        <item>@string/ur</item>
-        <item>@string/uz</item>
-        <item>@string/ve</item>
-        <item>@string/vi</item>
-        <item>@string/wa</item>
-        <item>@string/cy</item>
-        <item>@string/fy</item>
-        <item>@string/wo</item>
-        <item>@string/xh</item>
-        <item>@string/yi</item>
-        <item>@string/yo</item>
-        <item>@string/za</item>
-        <item>@string/zu</item>
-    </string-array>
-
-    <string-array name="languageValues">
-        <item>ab</item>
-        <item>aa</item>
-        <item>af</item>
-        <item>ak</item>
-        <item>sq</item>
-        <item>ase</item>
-        <item>am</item>
-        <item>ar</item>
-        <item>an</item>
-        <item>hy</item>
-        <item>as</item>
-        <item>av</item>
-        <item>ay</item>
-        <item>az</item>
-        <item>bm</item>
-        <item>ba</item>
-        <item>eu</item>
-        <item>be</item>
-        <item>bn</item>
-        <item>bn_rBD</item>
-        <item>bi</item>
-        <item>bs</item>
-        <item>bzs</item>
-        <item>br</item>
-        <item>bfi</item>
-        <item>bg</item>
-        <item>my</item>
-        <item>ca</item>
-        <item>ch</item>
-        <item>ce</item>
-        <item>zh</item>
-        <item>csl</item>
-        <item>cv</item>
-        <item>kw</item>
-        <item>co</item>
-        <item>cr</item>
-        <item>hr</item>
-        <item>cs</item>
-        <item>cse</item>
-        <item>da</item>
-        <item>dsl</item>
-        <item>dv</item>
-        <item>nl</item>
-        <item>dz</item>
-        <item>en</item>
-        <item>eo</item>
-        <item>et</item>
-        <item>ee</item>
-        <item>fo</item>
-        <item>fj</item>
-        <item>fi</item>
-        <item>fr</item>
-        <item>fsl</item>
-        <item>ff</item>
-        <item>gl</item>
-        <item>lg</item>
-        <item>ka</item>
-        <item>de</item>
-        <item>gsg</item>
-        <item>gn</item>
-        <item>gu</item>
-        <item>ht</item>
-        <item>ha</item>
-        <item>he</item>
-        <item>hz</item>
-        <item>hi</item>
-        <item>ho</item>
-        <item>hu</item>
-        <item>is</item>
-        <item>ig</item>
-        <item>id</item>
-        <item>iu</item>
-        <item>ik</item>
-        <item>ga</item>
-        <item>it</item>
-        <item>ja</item>
-        <item>jsl</item>
-        <item>jv</item>
-        <item>kl</item>
-        <item>kn</item>
-        <item>kr</item>
-        <item>ks</item>
-        <item>kk</item>
-        <item>km</item>
-        <item>ki</item>
-        <item>rw</item>
-        <item>ky</item>
-        <item>tlh</item>
-        <item>kv</item>
-        <item>kg</item>
-        <item>ko</item>
-        <item>avk</item>
-        <item>kj</item>
-        <item>ku</item>
-        <item>lo</item>
-        <item>lv</item>
-        <item>li</item>
-        <item>ln</item>
-        <item>lt</item>
-        <item>jbo</item>
-        <item>lu</item>
-        <item>lb</item>
-        <item>mk</item>
-        <item>mg</item>
-        <item>ms</item>
-        <item>ml</item>
-        <item>mt</item>
-        <item>gv</item>
-        <item>mi</item>
-        <item>mr</item>
-        <item>mh</item>
-        <item>el</item>
-        <item>mn</item>
-        <item>na</item>
-        <item>nv</item>
-        <item>ng</item>
-        <item>ne</item>
-        <item>nd</item>
-        <item>se</item>
-        <item>no</item>
-        <item>nb</item>
-        <item>nn</item>
-        <item>ny</item>
-        <item>oc</item>
-        <item>oj</item>
-        <item>or</item>
-        <item>om</item>
-        <item>os</item>
-        <item>pks</item>
-        <item>pa</item>
-        <item>fa</item>
-        <item>pl</item>
-        <item>pt</item>
-        <item>ps</item>
-        <item>qu</item>
-        <item>ro</item>
-        <item>rm</item>
-        <item>rn</item>
-        <item>ru</item>
-        <item>rsl</item>
-        <item>sm</item>
-        <item>sg</item>
-        <item>sc</item>
-        <item>sdl</item>
-        <item>gd</item>
-        <item>sr</item>
-        <item>sh</item>
-        <item>sn</item>
-        <item>ii</item>
-        <item>sd</item>
-        <item>si</item>
-        <item>sk</item>
-        <item>sl</item>
-        <item>so</item>
-        <item>sfs</item>
-        <item>nr</item>
-        <item>st</item>
-        <item>es</item>
-        <item>su</item>
-        <item>sw</item>
-        <item>ss</item>
-        <item>sv</item>
-        <item>swl</item>
-        <item>tl</item>
-        <item>ty</item>
-        <item>tg</item>
-        <item>ta</item>
-        <item>tt</item>
-        <item>te</item>
-        <item>th</item>
-        <item>bo</item>
-        <item>ti</item>
-        <item>to</item>
-        <item>ts</item>
-        <item>tn</item>
-        <item>tr</item>
-        <item>tk</item>
-        <item>tw</item>
-        <item>ug</item>
-        <item>uk</item>
-        <item>ur</item>
-        <item>uz</item>
-        <item>ve</item>
-        <item>vi</item>
-        <item>wa</item>
-        <item>cy</item>
-        <item>fy</item>
-        <item>wo</item>
-        <item>xh</item>
-        <item>yi</item>
-        <item>yo</item>
-        <item>za</item>
-        <item>zu</item>
-    </string-array>
-
-    <string-array name="supportedLanguagesValues">
-        <item>ar</item>
-        <item>bn</item>
-        <item>bn_rBD</item>
-        <item>cs</item>
-        <item>de</item>
-        <item>el</item>
-        <item>en</item>
-        <item>es</item>
-        <item>fa</item>
-        <item>fi</item>
-        <item>fr</item>
-        <item>gd</item>
-        <item>hi</item>
-        <item>it</item>
-        <item>ja</item>
-        <item>no</item>
-        <item>nl</item>
-        <item>pl</item>
-        <item>ru</item>
-        <item>sv</item>
-        <item>tr</item>
-        <item>uk</item>
-        <item>zh-rCN</item>
-        <item>zh-rTW</item>
-    </string-array>
-
-    <string-array name="supportedLanguagesArray">
-        <item>@string/ar</item>
-        <item>@string/bn</item>
-        <item>@string/bn_rBD</item>
-        <item>@string/cs</item>
-        <item>@string/de</item>
-        <item>@string/el</item>
-        <item>@string/en</item>
-        <item>@string/es</item>
-        <item>@string/fa</item>
-        <item>@string/fi</item>
-        <item>@string/fr</item>
-        <item>@string/gd</item>
-        <item>@string/hi</item>
-        <item>@string/it</item>
-        <item>@string/ja</item>
-        <item>@string/no</item>
-        <item>@string/nl</item>
-        <item>@string/pl</item>
-        <item>@string/ru</item>
-        <item>@string/sv</item>
-        <item>@string/tr</item>
-        <item>@string/uk</item>
-        <item>@string/zh</item>
-        <item>@string/tw</item>
-    </string-array>
-
-
-    <string-array name="empty_array" />
-
-    <string-array name="quality">
-        <item>Low</item>
-        <item>Medium</item>
-        <item>High</item>
-    </string-array>
-
-    <string-array name="qualityValues">
-        <item>Low</item>
-        <item>Medium</item>
-        <item>High</item>
-    </string-array>
-
-    <string-array name="videoSpeed">
-        <item>0.5x</item>
-        <item>0.75x</item>
-        <item>Normal</item>
-        <item>1.25x</item>
-        <item>1.5x</item>
-        <item>2x</item>
-    </string-array>
-
-    <string-array name="videoSpeedValues">
-        <item>0.5</item>
-        <item>0.75</item>
-        <item>1.0</item>
-        <item>1.25</item>
-        <item>1.5</item>
-        <item>2.0</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 812cb7b..0000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index 5c34102..0000000
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#1E88E5</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index 880db29..0000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
-
-    </style>
-
-    <style name="AppTheme.NoActionBar" parent="AppTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.RED" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorRed</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorRed</item>
-        <item name="colorAccent">@color/secondaryColorRed</item>
-    </style>
-
-    <style name="AppTheme.PINK" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorPink</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorPink</item>
-        <item name="colorAccent">@color/secondaryColorPink</item>
-    </style>
-
-    <style name="AppTheme.PURPLE" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorPurple</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorPurple</item>
-        <item name="colorAccent">@color/secondaryColorPurple</item>
-    </style>
-
-    <style name="AppTheme.DEEPPURPLE" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorDeepPurple</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorDeepPurple</item>
-        <item name="colorAccent">@color/secondaryColorDeepPurple</item>
-    </style>
-
-    <style name="AppTheme.INDIGO" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorIndigo</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorIndigo</item>
-        <item name="colorAccent">@color/secondaryColorIndigo</item>
-    </style>
-
-    <style name="AppTheme.BLUE" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorBlue</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorBlue</item>
-        <item name="colorAccent">@color/secondaryColorBlue</item>
-    </style>
-
-    <style name="AppTheme.LIGHTBLUE" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorLightBlue</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorLightBlue</item>
-        <item name="colorAccent">@color/secondaryColorLightBlue</item>
-    </style>
-
-    <style name="AppTheme.CYAN" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorCyan</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorCyan</item>
-        <item name="colorAccent">@color/secondaryColorCyan</item>
-    </style>
-
-    <style name="AppTheme.TEAL" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorTeal</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorTeal</item>
-        <item name="colorAccent">@color/secondaryColorTeal</item>
-    </style>
-
-    <style name="AppTheme.GREEN" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorGreen</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorGreen</item>
-        <item name="colorAccent">@color/secondaryColorGreen</item>
-    </style>
-
-    <style name="AppTheme.LIGHTGREEN" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorLightGreen</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorLightGreen</item>
-        <item name="colorAccent">@color/secondaryColorLightGreen</item>
-    </style>
-
-    <style name="AppTheme.LIME" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorLime</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorLime</item>
-        <item name="colorAccent">@color/secondaryColorLime</item>
-    </style>
-
-    <style name="AppTheme.YELLOW" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorYellow</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorYellow</item>
-        <item name="colorAccent">@color/secondaryColorYellow</item>
-    </style>
-
-    <style name="AppTheme.AMBER" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorAmber</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorAmber</item>
-        <item name="colorAccent">@color/secondaryColorAmber</item>
-    </style>
-
-    <style name="AppTheme.ORANGE" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorOrange</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorOrange</item>
-        <item name="colorAccent">@color/secondaryColorOrange</item>
-    </style>
-
-    <style name="AppTheme.DEEPORANGE" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorDeepOrange</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorDeepOrange</item>
-        <item name="colorAccent">@color/secondaryColorDeepOrange</item>
-    </style>
-
-    <style name="AppTheme.BROWN" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorBrown</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorBrown</item>
-        <item name="colorAccent">@color/secondaryColorBrown</item>
-    </style>
-
-    <style name="AppTheme.GRAY" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorGray</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorGray</item>
-        <item name="colorAccent">@color/secondaryColorGray</item>
-    </style>
-
-    <style name="AppTheme.BLUEGRAY" parent="AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/primaryColorBlueGray</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColorBlueGray</item>
-        <item name="colorAccent">@color/secondaryColorBlueGray</item>
-    </style>
-
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-
-    <!-- Text styles -->
-    <style name="Text" parent="TextAppearance.AppCompat" />
-
-    <style name="Text.Caption" parent="TextAppearance.AppCompat.Caption" />
-
-    <style name="Text.Small" parent="TextAppearance.AppCompat.Small" />
-
-    <style name="Text.Body1" parent="TextAppearance.AppCompat.Body1" />
-
-    <style name="Text.Body2" parent="TextAppearance.AppCompat.Body2" />
-
-    <style name="Text.Medium" parent="TextAppearance.AppCompat.Medium" />
-
-    <style name="Text.Large" parent="TextAppearance.AppCompat.Large" />
-
-    <style name="Text.Headline" parent="TextAppearance.AppCompat.Headline" />
-
-    <style name="Text.Title" parent="TextAppearance.AppCompat.Title" />
-
-    <style name="Text.Display1" parent="TextAppearance.AppCompat.Display1" />
-
-    <style name="Text.Subhead" parent="TextAppearance.AppCompat.Subhead" />
-
-    <style name="Text.Button" parent="TextAppearance.AppCompat.Button" />
-
-    <!-- Button Styles-->
-    <style name="Buton" parent="Widget.AppCompat.Button" />
-
-    <style name="Buton.Small" parent="Widget.AppCompat.Button.Small" />
-
-    <style name="Buton.Colored" parent="Widget.AppCompat.Button.Colored" />
-
-    <style name="Buton.Borderless" parent="Widget.AppCompat.Button.Borderless" />
-
-    <style name="Buton.Borderless.Colored" parent="Widget.AppCompat.Button.Borderless.Colored" />
-
-
-</resources>
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
deleted file mode 100644
index 6fd6103..0000000
--- a/app/src/main/res/xml/backup_descriptor.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-    <!-- Exclude specific shared preferences that contain GCM registration Id -->
-</full-backup-content>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
deleted file mode 100644
index d9c649d..0000000
--- a/app/src/main/res/xml/root_preferences.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory app:title="@string/settings_activity_look_and_feel_category_title" app:iconSpaceReserved="false">
-
-        <ListPreference
-            app:entries="@array/supportedLanguagesArray"
-            app:entryValues="@array/supportedLanguagesValues"
-            app:key="@string/pref_language_app_key"
-            app:summary="@string/pref_description_language_app"
-            app:title="@string/pref_language_app"
-            app:iconSpaceReserved="false"/>
-
-        <ListPreference
-            app:defaultValue="AppTheme.BLUE"
-            app:entries="@array/themeArray"
-            app:entryValues="@array/themeValues"
-            app:key="@string/pref_theme_key"
-            app:summary="@string/pref_description_app_theme"
-            app:title="@string/pref_title_app_theme"
-            app:iconSpaceReserved="false"/>
-
-        <SwitchPreference
-            app:defaultValue="false"
-            app:key="@string/pref_dark_mode_key"
-            app:summary="@string/pref_description_dark_mode"
-            app:title="@string/pref_title_dark_mode"
-            app:iconSpaceReserved="false"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory app:title="@string/settings_activity_video_list_category_title" app:iconSpaceReserved="false">
-
-        <SwitchPreference
-            app:defaultValue="false"
-            app:key="@string/pref_show_nsfw_key"
-            app:summary="@string/pref_description_show_nsfw"
-            app:title="@string/pref_title_show_nsfw"
-            app:iconSpaceReserved="false"/>
-
-        <MultiSelectListPreference
-            app:defaultValue="@array/empty_array"
-            app:entries="@array/languageArray"
-            app:entryValues="@array/languageValues"
-            app:key="@string/pref_video_language_key"
-            app:summary="@string/pref_description_language"
-            app:title="@string/pref_language"
-            app:iconSpaceReserved="false"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory app:title="@string/settings_activity_video_playback_category_title" app:iconSpaceReserved="false">
-
-        <ListPreference
-            app:defaultValue="1.0"
-            app:entries="@array/videoSpeed"
-            app:entryValues="@array/videoSpeedValues"
-            app:key="@string/pref_video_speed_key"
-            app:summary="@string/pref_description_video_speed"
-            app:title="@string/pref_title_video_speed"
-            app:iconSpaceReserved="false"/>
-
-        <SwitchPreference
-            app:defaultValue="true"
-            app:key="@string/pref_back_pause_key"
-            app:summary="@string/pref_description_back_pause"
-            app:title="@string/pref_title_back_pause"
-            app:iconSpaceReserved="false"/>
-
-        <ListPreference
-            app:defaultValue="@array/empty_array"
-            app:entries="@array/backgroundBehavior"
-            app:entryValues="@array/backgroundBehaviorValues"
-            app:key="@string/pref_background_behavior_key"
-            app:summary="@string/pref_background_behavior_summary"
-            app:title="@string/pref_background_behavior"
-            app:iconSpaceReserved="false"/>
-
-<!--        <SwitchPreference-->
-<!--            app:defaultValue="false"-->
-<!--            app:key="@string/pref_torrent_player_key"-->
-<!--            app:summary="@string/pref_description_torrent_player"-->
-<!--            app:title="@string/pref_title_torrent_player"-->
-<!--            app:iconSpaceReserved="false"/>-->
-
-    </PreferenceCategory>
-
-    <PreferenceCategory app:title="@string/settings_activity_advanced_category_title" app:iconSpaceReserved="false">
-
-        <SwitchPreference
-            app:defaultValue="false"
-            app:key="@string/pref_accept_insecure"
-            app:summary="@string/pref_description_accept_insecure"
-            app:title="@string/pref_title_accept_insecure"
-            app:iconSpaceReserved="false"/>
-
-            <Preference
-            app:title="@string/clear_search_history"
-            app:key="@string/pref_clear_history_key"
-            app:summary="@string/clear_search_history_prompt"
-            app:iconSpaceReserved="false"/>
-            />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory app:title="@string/settings_activity_about_category_title" app:iconSpaceReserved="false">
-
-        <Preference
-            app:summary="@string/versionName"
-            app:title="@string/pref_title_version"
-            app:iconSpaceReserved="false"/>
-
-        <Preference
-            app:key="pref_buildtime"
-            app:summary=""
-            app:title="@string/pref_title_buildtime"
-            app:iconSpaceReserved="false"/>
-
-        <Preference
-            app:summary="@string/pref_description_license"
-            app:title="@string/pref_title_license"
-            app:iconSpaceReserved="false"/>
-
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
deleted file mode 100644
index a89bfa9..0000000
--- a/app/src/main/res/xml/searchable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/app_name"
-    android:hint="@string/search_hint"
-    android:searchSuggestAuthority="net.schueller.peertube.provider.SearchSuggestionsProvider"
-    android:searchSuggestSelection=" ? ">
-</searchable>
\ No newline at end of file
diff --git a/app/src/test/java/net/schueller/peertube/ExampleUnitTest.java b/app/src/test/java/net/schueller/peertube/ExampleUnitTest.java
deleted file mode 100644
index 49d2db2..0000000
--- a/app/src/test/java/net/schueller/peertube/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package net.schueller.peertube;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d6285b4..a9fd8e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,42 +1,24 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-
-    ext.kotlin_version = '1.6.10'
-    
+    ext {
+        compose_version = '1.0.5'
+        room_version = "2.4.1"
+    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        
+        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.38.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
-}
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven {
-            url 'https://oss.sonatype.org/content/repositories/snapshots'
-        }
-        maven {
-            url 'https://jitpack.io'
-        }
-    }
-    // https://issuetracker.google.com/issues/174695268?pli=1#comment9
-    configurations.all {
-        resolutionStrategy {
-            force 'org.xerial:sqlite-jdbc:3.34.0'
-        }
-    }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index cac7c68..1e6212b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# https://youtrack.jetbrains.com/issue/KT-45545#focus=Comments-27-5166414.0-0
+kotlin.daemon.jvmargs=--illegal-access=permit
+kapt.use.worker.api=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a0046ce..1040fb8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jan 04 11:38:05 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index e7b4def..c2ec1ed 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,11 @@
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url "https://jitpack.io" }
+        jcenter() // Warning: this repository is going to shut down soon
+    }
+}
+rootProject.name = "Peertube"
 include ':app'