From fcb1974e78698640446f8624d85a197cd12cde44 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 5 May 2022 08:53:25 +0200 Subject: [PATCH] theming --- app/build.gradle | 3 ++ .../fedilabtube/activities/BaseActivity.java | 26 ++++++++++ app/src/fdroid_acad/AndroidManifest.xml | 2 +- app/src/fdroid_full/AndroidManifest.xml | 2 +- .../fedilabtube/activities/BaseActivity.java | 26 ++++++++++ app/src/google_acad/AndroidManifest.xml | 2 +- .../fedilab/fedilabtube/BaseMainActivity.java | 3 +- .../fedilabtube/BasePeertubeActivity.java | 3 +- .../res/layout/activity_donation.xml | 2 +- app/src/google_full/AndroidManifest.xml | 4 +- app/src/main/AndroidManifest.xml | 48 +++++++++---------- .../fedilab/fedilabtube/BaseFedilabTube.java | 2 +- .../{ => activities}/AboutActivity.java | 6 ++- .../{ => activities}/AccountActivity.java | 7 +-- .../AllLocalPlaylistsActivity.java | 5 +- .../AllPlaylistsActivity.java | 8 ++-- .../InstancePickerActivity.java | 6 +-- .../LocalPlaylistsActivity.java | 3 +- .../{ => activities}/LoginActivity.java | 6 ++- .../{ => activities}/MainActivity.java | 13 +++-- .../ManageInstancesActivity.java | 10 ++-- .../MastodonWebviewConnectActivity.java | 5 +- .../{ => activities}/MyAccountActivity.java | 7 +-- .../{ => activities}/PeertubeActivity.java | 6 ++- .../PeertubeEditUploadActivity.java | 5 +- .../PeertubeRegisterActivity.java | 8 ++-- .../PeertubeUploadActivity.java | 12 +++-- .../{ => activities}/PlaylistsActivity.java | 5 +- .../{ => activities}/SearchActivity.java | 5 +- .../{ => activities}/SepiaSearchActivity.java | 7 +-- .../{ => activities}/SettingsActivity.java | 4 +- .../{ => activities}/ShowAccountActivity.java | 5 +- .../{ => activities}/ShowChannelActivity.java | 7 +-- .../VideosTimelineActivity.java | 5 +- .../{ => activities}/WebviewActivity.java | 5 +- .../WebviewConnectActivity.java | 6 +-- .../client/RetrofitPeertubeAPI.java | 2 +- .../client/mastodon/RetrofitMastodonAPI.java | 2 +- .../drawer/AccountsListAdapter.java | 2 +- .../drawer/ChannelListAdapter.java | 4 +- .../drawer/CommentListAdapter.java | 5 +- .../fedilabtube/drawer/PeertubeAdapter.java | 6 +-- .../PeertubeNotificationsListAdapter.java | 10 ++-- .../fedilabtube/drawer/PlaylistAdapter.java | 8 ++-- .../fragment/DisplayChannelsFragment.java | 4 +- .../fragment/DisplayPlaylistsFragment.java | 2 +- .../fragment/DisplayVideosFragment.java | 2 +- .../fragment/SettingsFragment.java | 4 +- .../fedilab/fedilabtube/helper/Helper.java | 4 +- .../helper/PlaylistExportHelper.java | 2 +- .../helper/SwitchAccountHelper.java | 4 +- .../worker/NotificationsWorker.java | 6 +-- app/src/main/res/layout/activity_about.xml | 2 +- app/src/main/res/layout/activity_account.xml | 2 +- .../res/layout/activity_instance_picker.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- .../res/layout/activity_manage_instances.xml | 2 +- app/src/main/res/layout/activity_peertube.xml | 2 +- .../res/layout/activity_peertube_upload.xml | 2 +- .../main/res/layout/activity_playlists.xml | 2 +- .../res/layout/activity_search_result.xml | 2 +- .../main/res/layout/activity_sepia_search.xml | 2 +- .../main/res/layout/activity_show_account.xml | 2 +- .../main/res/layout/activity_show_channel.xml | 2 +- app/src/main/res/layout/fragment_overview.xml | 2 +- app/src/main/res/layout/fragment_video.xml | 2 +- 66 files changed, 230 insertions(+), 144 deletions(-) create mode 100644 app/src/acad/java/app/fedilab/fedilabtube/activities/BaseActivity.java create mode 100644 app/src/full/java/app/fedilab/fedilabtube/activities/BaseActivity.java rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/AboutActivity.java (96%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/AccountActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/AllLocalPlaylistsActivity.java (95%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/AllPlaylistsActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/InstancePickerActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/LocalPlaylistsActivity.java (97%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/LoginActivity.java (99%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/MainActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/ManageInstancesActivity.java (93%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/MastodonWebviewConnectActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/MyAccountActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/PeertubeActivity.java (99%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/PeertubeEditUploadActivity.java (99%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/PeertubeRegisterActivity.java (97%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/PeertubeUploadActivity.java (97%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/PlaylistsActivity.java (96%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/SearchActivity.java (97%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/SepiaSearchActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/SettingsActivity.java (93%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/ShowAccountActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/ShowChannelActivity.java (99%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/VideosTimelineActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/WebviewActivity.java (98%) rename app/src/main/java/app/fedilab/fedilabtube/{ => activities}/WebviewConnectActivity.java (98%) diff --git a/app/build.gradle b/app/build.gradle index b07c0d7..a3701f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -193,6 +193,7 @@ dependencies { google_acadImplementation "com.google.android.gms:play-services-cast:21.0.1" google_acadImplementation "androidx.mediarouter:mediarouter:1.3.0" google_acadImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1' + google_acadImplementation 'com.github.evozi:Cyanea:1.0.7' google_fullImplementation "com.google.android.gms:play-services-cast-tv:19.0.1" google_fullImplementation "com.google.android.gms:play-services-cast:21.0.1" @@ -203,6 +204,8 @@ dependencies { fdroid_acadImplementation 'su.litvak.chromecast:api-v2:0.11.3' fdroid_acadImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0' fdroid_acadImplementation 'org.slf4j:slf4j-simple:1.7.30' + fdroid_acadImplementation 'com.github.evozi:Cyanea:1.0.7' + fdroid_fullImplementation 'su.litvak.chromecast:api-v2:0.11.3' fdroid_fullImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0' fdroid_fullImplementation 'org.slf4j:slf4j-simple:1.7.30' diff --git a/app/src/acad/java/app/fedilab/fedilabtube/activities/BaseActivity.java b/app/src/acad/java/app/fedilab/fedilabtube/activities/BaseActivity.java new file mode 100644 index 0000000..5a2ddf1 --- /dev/null +++ b/app/src/acad/java/app/fedilab/fedilabtube/activities/BaseActivity.java @@ -0,0 +1,26 @@ +package app.fedilab.fedilabtube.activities; +/* Copyright 2022 Thomas Schneider + * + * This file is a part of TubeLab + * + * 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. + * + * TubeLab 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 TubeLab; if not, + * see . */ +import android.os.Bundle; + +import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity; + +public class BaseActivity extends CyaneaAppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } +} diff --git a/app/src/fdroid_acad/AndroidManifest.xml b/app/src/fdroid_acad/AndroidManifest.xml index 89d0750..c26ac39 100644 --- a/app/src/fdroid_acad/AndroidManifest.xml +++ b/app/src/fdroid_acad/AndroidManifest.xml @@ -15,7 +15,7 @@ tools:replace="android:allowBackup"> diff --git a/app/src/fdroid_full/AndroidManifest.xml b/app/src/fdroid_full/AndroidManifest.xml index 3f8bb61..75bb550 100644 --- a/app/src/fdroid_full/AndroidManifest.xml +++ b/app/src/fdroid_full/AndroidManifest.xml @@ -15,7 +15,7 @@ tools:replace="android:allowBackup"> diff --git a/app/src/full/java/app/fedilab/fedilabtube/activities/BaseActivity.java b/app/src/full/java/app/fedilab/fedilabtube/activities/BaseActivity.java new file mode 100644 index 0000000..f2a1842 --- /dev/null +++ b/app/src/full/java/app/fedilab/fedilabtube/activities/BaseActivity.java @@ -0,0 +1,26 @@ +package app.fedilab.fedilabtube.activities; +/* Copyright 2022 Thomas Schneider + * + * This file is a part of TubeLab + * + * 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. + * + * TubeLab 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 TubeLab; if not, + * see . */ +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +public class BaseActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } +} diff --git a/app/src/google_acad/AndroidManifest.xml b/app/src/google_acad/AndroidManifest.xml index 42e78f4..bc65866 100644 --- a/app/src/google_acad/AndroidManifest.xml +++ b/app/src/google_acad/AndroidManifest.xml @@ -15,7 +15,7 @@ tools:replace="android:allowBackup"> diff --git a/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BaseMainActivity.java b/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BaseMainActivity.java index 1f5b39a..15ccd8f 100644 --- a/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BaseMainActivity.java +++ b/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BaseMainActivity.java @@ -19,9 +19,10 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; +import app.fedilab.fedilabtube.activities.BaseActivity; import app.fedilab.fedilabtube.databinding.ActivityMainBinding; -public class BaseMainActivity extends AppCompatActivity { +public class BaseMainActivity extends BaseActivity { protected ActivityMainBinding binding; diff --git a/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BasePeertubeActivity.java b/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BasePeertubeActivity.java index f0b3b7a..200cf1f 100644 --- a/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BasePeertubeActivity.java +++ b/app/src/google_cast_lib/java/app/fedilab/fedilabtube/BasePeertubeActivity.java @@ -34,11 +34,12 @@ import com.google.android.gms.cast.framework.SessionManagerListener; import com.google.android.gms.cast.framework.media.RemoteMediaClient; import com.google.android.gms.common.images.WebImage; +import app.fedilab.fedilabtube.activities.BaseActivity; import app.fedilab.fedilabtube.client.data.VideoData; import app.fedilab.fedilabtube.databinding.ActivityPeertubeBinding; import app.fedilab.fedilabtube.helper.Helper; -public class BasePeertubeActivity extends AppCompatActivity { +public class BasePeertubeActivity extends BaseActivity { protected ActivityPeertubeBinding binding; protected VideoData.Video peertube; diff --git a/app/src/google_donation/res/layout/activity_donation.xml b/app/src/google_donation/res/layout/activity_donation.xml index 9c07a5a..5bfadb2 100644 --- a/app/src/google_donation/res/layout/activity_donation.xml +++ b/app/src/google_donation/res/layout/activity_donation.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context=".ShowChannelActivity"> + tools:context=".activities.ShowChannelActivity"> @@ -30,7 +30,7 @@ + android:value=".activities.PeertubeActivity" /> @@ -41,85 +41,85 @@ @@ -136,22 +136,22 @@ diff --git a/app/src/main/java/app/fedilab/fedilabtube/BaseFedilabTube.java b/app/src/main/java/app/fedilab/fedilabtube/BaseFedilabTube.java index f0b7663..7755edb 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/BaseFedilabTube.java +++ b/app/src/main/java/app/fedilab/fedilabtube/BaseFedilabTube.java @@ -35,7 +35,7 @@ import app.fedilab.fedilabtube.worker.WorkHelper; public class BaseFedilabTube extends MultiDexApplication { - static String UPLOAD_CHANNEL_ID = "upload_info_peertube"; + public static String UPLOAD_CHANNEL_ID = "upload_info_peertube"; @Override public void onCreate() { diff --git a/app/src/main/java/app/fedilab/fedilabtube/AboutActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java similarity index 96% rename from app/src/main/java/app/fedilab/fedilabtube/AboutActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java index f62b128..ed50631 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/AboutActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -31,10 +31,12 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; +import app.fedilab.fedilabtube.BuildConfig; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.helper.Helper; -public class AboutActivity extends AppCompatActivity { +public class AboutActivity extends BaseActivity { @Override diff --git a/app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java index 7982871..812a1c9 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.MainActivity.badgeCount; +import static app.fedilab.fedilabtube.activities.MainActivity.badgeCount; import android.content.Intent; import android.content.SharedPreferences; @@ -45,6 +45,7 @@ import com.google.android.material.tabs.TabLayout; import org.jetbrains.annotations.NotNull; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.databinding.ActivityAccountBinding; @@ -57,7 +58,7 @@ import app.fedilab.fedilabtube.sqlite.AccountDAO; import app.fedilab.fedilabtube.sqlite.Sqlite; -public class AccountActivity extends AppCompatActivity { +public class AccountActivity extends BaseActivity { private ActivityAccountBinding binding; diff --git a/app/src/main/java/app/fedilab/fedilabtube/AllLocalPlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java similarity index 95% rename from app/src/main/java/app/fedilab/fedilabtube/AllLocalPlaylistsActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java index 775edc5..5f9d18c 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/AllLocalPlaylistsActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -31,13 +31,14 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.ArrayList; import java.util.List; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist; import app.fedilab.fedilabtube.client.data.VideoPlaylistData; import app.fedilab.fedilabtube.drawer.PlaylistAdapter; import app.fedilab.fedilabtube.viewmodel.PlaylistsVM; -public class AllLocalPlaylistsActivity extends AppCompatActivity implements PlaylistAdapter.AllPlaylistRemoved { +public class AllLocalPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved { PlaylistAdapter playlistAdapter; diff --git a/app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java index 26a36c7..a574467 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE; +import static app.fedilab.fedilabtube.activities.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE; import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation; import android.Manifest; @@ -38,7 +38,6 @@ import android.widget.Button; import android.widget.Toast; import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; @@ -56,6 +55,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.ChannelData; @@ -71,7 +71,7 @@ import app.fedilab.fedilabtube.viewmodel.PlaylistsVM; import es.dmoral.toasty.Toasty; -public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistAdapter.AllPlaylistRemoved { +public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved { private static final int PICK_AVATAR = 467; diff --git a/app/src/main/java/app/fedilab/fedilabtube/InstancePickerActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/InstancePickerActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java index 7de07e1..c106df8 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/InstancePickerActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -31,7 +31,6 @@ import android.widget.TextView; import android.widget.Toast; import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -42,6 +41,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.data.InstanceData; import app.fedilab.fedilabtube.client.entities.InstanceParams; @@ -51,7 +51,7 @@ import app.fedilab.fedilabtube.viewmodel.InstancesVM; import es.dmoral.toasty.Toasty; -public class InstancePickerActivity extends AppCompatActivity { +public class InstancePickerActivity extends BaseActivity { boolean[] checkedItemsCategory; diff --git a/app/src/main/java/app/fedilab/fedilabtube/LocalPlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java similarity index 97% rename from app/src/main/java/app/fedilab/fedilabtube/LocalPlaylistsActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java index 653e500..efd0d31 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/LocalPlaylistsActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -21,6 +21,7 @@ import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentTransaction; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.data.PlaylistData; import app.fedilab.fedilabtube.fragment.DisplayVideosFragment; import app.fedilab.fedilabtube.helper.Helper; diff --git a/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java similarity index 99% rename from app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java index 266af76..7ed4cb6 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -41,6 +41,8 @@ import java.net.URL; import java.util.Arrays; import java.util.List; +import app.fedilab.fedilabtube.BuildConfig; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.entities.AcadInstances; import app.fedilab.fedilabtube.client.entities.Error; @@ -56,7 +58,7 @@ import app.fedilab.fedilabtube.helper.HelperInstance; import es.dmoral.toasty.Toasty; -public class LoginActivity extends AppCompatActivity { +public class LoginActivity extends BaseActivity { private static String client_id; diff --git a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/MainActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java index bbf1837..ce52729 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,8 +14,8 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.NORMAL; -import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.SURFING; +import static app.fedilab.fedilabtube.activities.MainActivity.TypeOfConnection.NORMAL; +import static app.fedilab.fedilabtube.activities.MainActivity.TypeOfConnection.SURFING; import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation; import android.annotation.SuppressLint; @@ -60,6 +60,11 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; +import app.fedilab.fedilabtube.BaseMainActivity; +import app.fedilab.fedilabtube.BuildConfig; +import app.fedilab.fedilabtube.DonationActivity; +import app.fedilab.fedilabtube.Matomo; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.client.data.InstanceData; @@ -340,7 +345,7 @@ public class MainActivity extends BaseMainActivity { int search_cast = sharedpreferences.getInt(getString(R.string.set_cast_choice), BuildConfig.cast_enabled); if (search_cast == 1) { - discoverCast(); + super.discoverCast(); } } diff --git a/app/src/main/java/app/fedilab/fedilabtube/ManageInstancesActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java similarity index 93% rename from app/src/main/java/app/fedilab/fedilabtube/ManageInstancesActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java index 2b0b5df..ed2a008 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/ManageInstancesActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,8 +14,8 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.MainActivity.PICK_INSTANCE_SURF; -import static app.fedilab.fedilabtube.MainActivity.showRadioButtonDialogFullInstances; +import static app.fedilab.fedilabtube.activities.MainActivity.PICK_INSTANCE_SURF; +import static app.fedilab.fedilabtube.activities.MainActivity.showRadioButtonDialogFullInstances; import android.annotation.SuppressLint; import android.app.Activity; @@ -26,13 +26,13 @@ import android.os.Handler; import android.view.MenuItem; import android.view.View; -import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import java.util.ArrayList; import java.util.List; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.InstanceData; import app.fedilab.fedilabtube.databinding.ActivityManageInstancesBinding; @@ -43,7 +43,7 @@ import app.fedilab.fedilabtube.sqlite.StoredInstanceDAO; import app.fedilab.fedilabtube.viewmodel.InfoInstanceVM; -public class ManageInstancesActivity extends AppCompatActivity implements AboutInstanceAdapter.AllInstancesRemoved { +public class ManageInstancesActivity extends BaseActivity implements AboutInstanceAdapter.AllInstancesRemoved { private ActivityManageInstancesBinding binding; private List aboutInstances; diff --git a/app/src/main/java/app/fedilab/fedilabtube/MastodonWebviewConnectActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/MastodonWebviewConnectActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java index 88cabfd..69098a4 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/MastodonWebviewConnectActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; import android.annotation.SuppressLint; @@ -35,6 +35,7 @@ import android.widget.Toast; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.entities.Error; import app.fedilab.fedilabtube.client.entities.OauthParams; import app.fedilab.fedilabtube.client.entities.Token; @@ -43,7 +44,7 @@ import app.fedilab.fedilabtube.helper.Helper; import es.dmoral.toasty.Toasty; -public class MastodonWebviewConnectActivity extends AppCompatActivity { +public class MastodonWebviewConnectActivity extends BaseActivity { private WebView webView; diff --git a/app/src/main/java/app/fedilab/fedilabtube/MyAccountActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/MyAccountActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java index c507885..4cc4a7f 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/MyAccountActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE; +import static app.fedilab.fedilabtube.activities.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE; import static app.fedilab.fedilabtube.worker.WorkHelper.NOTIFICATION_WORKER; import android.Manifest; @@ -48,6 +48,7 @@ import com.bumptech.glide.request.RequestOptions; import org.jetbrains.annotations.NotNull; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.entities.Error; import app.fedilab.fedilabtube.client.entities.NotificationSettings; @@ -58,7 +59,7 @@ import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.worker.WorkHelper; import es.dmoral.toasty.Toasty; -public class MyAccountActivity extends AppCompatActivity { +public class MyAccountActivity extends BaseActivity { private static final int PICK_IMAGE = 466; ActivityMyAccountSettingsBinding binding; diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java similarity index 99% rename from app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java index bb22ba4..7f6e58b 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -131,6 +131,10 @@ import java.util.TimerTask; import java.util.regex.Matcher; import java.util.regex.Pattern; +import app.fedilab.fedilabtube.BasePeertubeActivity; +import app.fedilab.fedilabtube.BuildConfig; +import app.fedilab.fedilabtube.Matomo; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.MenuItemVideo; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java similarity index 99% rename from app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java index 5cf52bf..d1f153e 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -49,6 +49,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.ChannelData.Channel; @@ -66,7 +67,7 @@ import app.fedilab.fedilabtube.viewmodel.TimelineVM; import es.dmoral.toasty.Toasty; -public class PeertubeEditUploadActivity extends AppCompatActivity { +public class PeertubeEditUploadActivity extends BaseActivity { private final int PICK_IMAGE = 50378; diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java similarity index 97% rename from app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java index f8422c7..74b30c9 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.MainActivity.PICK_INSTANCE; +import static app.fedilab.fedilabtube.activities.MainActivity.PICK_INSTANCE; import android.annotation.SuppressLint; import android.app.Activity; @@ -36,6 +36,8 @@ import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; +import app.fedilab.fedilabtube.BuildConfig; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.entities.AccountCreation; @@ -44,7 +46,7 @@ import app.fedilab.fedilabtube.helper.HelperAcadInstance; import app.fedilab.fedilabtube.helper.HelperInstance; import es.dmoral.toasty.Toasty; -public class PeertubeRegisterActivity extends AppCompatActivity { +public class PeertubeRegisterActivity extends BaseActivity { private String instance; diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeUploadActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java similarity index 97% rename from app/src/main/java/app/fedilab/fedilabtube/PeertubeUploadActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java index 0b95b12..2c9b90d 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeUploadActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.MainActivity.userMe; +import static app.fedilab.fedilabtube.activities.MainActivity.userMe; import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS; import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation; @@ -56,6 +56,10 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import app.fedilab.fedilabtube.BaseFedilabTube; +import app.fedilab.fedilabtube.BuildConfig; +import app.fedilab.fedilabtube.FedilabTube; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.ChannelData; @@ -67,7 +71,7 @@ import app.fedilab.fedilabtube.viewmodel.ChannelsVM; import es.dmoral.toasty.Toasty; -public class PeertubeUploadActivity extends AppCompatActivity { +public class PeertubeUploadActivity extends BaseActivity { public static final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 724; @@ -413,6 +417,6 @@ public class PeertubeUploadActivity extends AppCompatActivity { clearOnAction ); - return new UploadNotificationConfig(FedilabTube.UPLOAD_CHANNEL_ID, ringToneEnabled, progress, success, error, cancelled); + return new UploadNotificationConfig(BaseFedilabTube.UPLOAD_CHANNEL_ID, ringToneEnabled, progress, success, error, cancelled); } } diff --git a/app/src/main/java/app/fedilab/fedilabtube/PlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java similarity index 96% rename from app/src/main/java/app/fedilab/fedilabtube/PlaylistsActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java index 299c751..f6a5de2 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PlaylistsActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -22,6 +22,7 @@ import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentTransaction; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.data.PlaylistData; import app.fedilab.fedilabtube.fragment.DisplayVideosFragment; import app.fedilab.fedilabtube.helper.Helper; @@ -30,7 +31,7 @@ import app.fedilab.fedilabtube.viewmodel.TimelineVM; import es.dmoral.toasty.Toasty; -public class PlaylistsActivity extends AppCompatActivity { +public class PlaylistsActivity extends BaseActivity { private final int PICK_IMPORT = 5556; diff --git a/app/src/main/java/app/fedilab/fedilabtube/SearchActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java similarity index 97% rename from app/src/main/java/app/fedilab/fedilabtube/SearchActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java index 636ca09..04dd4e9 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/SearchActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -30,13 +30,14 @@ import com.google.android.material.tabs.TabLayout; import org.jetbrains.annotations.NotNull; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding; import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment; import app.fedilab.fedilabtube.fragment.DisplayVideosFragment; import es.dmoral.toasty.Toasty; -public class SearchActivity extends AppCompatActivity { +public class SearchActivity extends BaseActivity { private String search; diff --git a/app/src/main/java/app/fedilab/fedilabtube/SepiaSearchActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/SepiaSearchActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java index 3fc4c67..eae7623 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/SepiaSearchActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.PeertubeActivity.hideKeyboard; +import static app.fedilab.fedilabtube.activities.PeertubeActivity.hideKeyboard; import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation; import android.content.Context; @@ -40,13 +40,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.entities.SepiaSearch; import app.fedilab.fedilabtube.databinding.ActivitySepiaSearchBinding; import app.fedilab.fedilabtube.fragment.DisplaySepiaSearchFragment; import app.fedilab.fedilabtube.helper.Helper; -public class SepiaSearchActivity extends AppCompatActivity { +public class SepiaSearchActivity extends BaseActivity { private SepiaSearch sepiaSearchVideo, sepiaSearchChannel; diff --git a/app/src/main/java/app/fedilab/fedilabtube/SettingsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java similarity index 93% rename from app/src/main/java/app/fedilab/fedilabtube/SettingsActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java index 529a4b0..c60e5ec 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/SettingsActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; import android.os.Bundle; import android.view.MenuItem; @@ -22,7 +22,7 @@ import app.fedilab.fedilabtube.fragment.SettingsFragment; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -public class SettingsActivity extends AppCompatActivity { +public class SettingsActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/app/fedilab/fedilabtube/ShowAccountActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/ShowAccountActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java index 3dd0ce0..c2f4b20 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -47,6 +47,7 @@ import com.google.android.material.tabs.TabLayout; import org.jetbrains.annotations.NotNull; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData; @@ -59,7 +60,7 @@ import app.fedilab.fedilabtube.viewmodel.TimelineVM; import es.dmoral.toasty.Toasty; -public class ShowAccountActivity extends AppCompatActivity { +public class ShowAccountActivity extends BaseActivity { private ViewPager mPager; diff --git a/app/src/main/java/app/fedilab/fedilabtube/ShowChannelActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java similarity index 99% rename from app/src/main/java/app/fedilab/fedilabtube/ShowChannelActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java index 3ed4b5c..5819205 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/ShowChannelActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -15,7 +15,7 @@ package app.fedilab.fedilabtube; * see . */ import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY; -import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.SURFING; +import static app.fedilab.fedilabtube.activities.MainActivity.TypeOfConnection.SURFING; import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.FOLLOW; import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE; import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT; @@ -62,6 +62,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData; @@ -79,7 +80,7 @@ import app.fedilab.fedilabtube.viewmodel.TimelineVM; import es.dmoral.toasty.Toasty; -public class ShowChannelActivity extends AppCompatActivity { +public class ShowChannelActivity extends BaseActivity { private Button account_follow; diff --git a/app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java index 1a07792..fb42161 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -34,6 +34,7 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.databinding.ActivityVideosTimelineBinding; import app.fedilab.fedilabtube.fragment.DisplayVideosFragment; @@ -41,7 +42,7 @@ import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.viewmodel.TimelineVM; -public class VideosTimelineActivity extends AppCompatActivity { +public class VideosTimelineActivity extends BaseActivity { private TimelineVM.TimelineType type; private DisplayVideosFragment displayVideosFragment; diff --git a/app/src/main/java/app/fedilab/fedilabtube/WebviewActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/WebviewActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java index 1bac265..4fc988d 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/WebviewActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -35,6 +35,7 @@ import androidx.core.content.ContextCompat; import org.jetbrains.annotations.NotNull; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.webview.CustomWebview; import app.fedilab.fedilabtube.webview.MastalabWebChromeClient; @@ -42,7 +43,7 @@ import app.fedilab.fedilabtube.webview.MastalabWebViewClient; import es.dmoral.toasty.Toasty; -public class WebviewActivity extends AppCompatActivity { +public class WebviewActivity extends BaseActivity { private String url; private boolean peertubeLink; diff --git a/app/src/main/java/app/fedilab/fedilabtube/WebviewConnectActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java similarity index 98% rename from app/src/main/java/app/fedilab/fedilabtube/WebviewConnectActivity.java rename to app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java index ebced17..8eca3c3 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/WebviewConnectActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java @@ -1,4 +1,4 @@ -package app.fedilab.fedilabtube; +package app.fedilab.fedilabtube.activities; /* Copyright 2020 Thomas Schneider * * This file is a part of TubeLab @@ -36,15 +36,15 @@ import androidx.appcompat.app.AppCompatActivity; import java.net.URL; import java.util.regex.Matcher; +import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.entities.Error; import app.fedilab.fedilabtube.client.entities.OauthParams; import app.fedilab.fedilabtube.client.entities.Token; import app.fedilab.fedilabtube.helper.Helper; -import app.fedilab.fedilabtube.webview.CustomWebview; -public class WebviewConnectActivity extends AppCompatActivity { +public class WebviewConnectActivity extends BaseActivity { private WebView webView; diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java b/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java index a5cd5a1..314c018 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java +++ b/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java @@ -46,7 +46,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import app.fedilab.fedilabtube.BuildConfig; -import app.fedilab.fedilabtube.MainActivity; +import app.fedilab.fedilabtube.activities.MainActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.data.AccountData; import app.fedilab.fedilabtube.client.data.BlockData; diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/mastodon/RetrofitMastodonAPI.java b/app/src/main/java/app/fedilab/fedilabtube/client/mastodon/RetrofitMastodonAPI.java index f3662dd..fca2bf4 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/client/mastodon/RetrofitMastodonAPI.java +++ b/app/src/main/java/app/fedilab/fedilabtube/client/mastodon/RetrofitMastodonAPI.java @@ -27,7 +27,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.concurrent.TimeUnit; -import app.fedilab.fedilabtube.MainActivity; +import app.fedilab.fedilabtube.activities.MainActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.entities.Error; diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java index 02069ad..5adfa5c 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java @@ -36,7 +36,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.List; import app.fedilab.fedilabtube.R; -import app.fedilab.fedilabtube.ShowAccountActivity; +import app.fedilab.fedilabtube.activities.ShowAccountActivity; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData.Account; diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java index e492d08..e819dd7 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java @@ -35,9 +35,9 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; -import app.fedilab.fedilabtube.AccountActivity; +import app.fedilab.fedilabtube.activities.AccountActivity; import app.fedilab.fedilabtube.R; -import app.fedilab.fedilabtube.ShowChannelActivity; +import app.fedilab.fedilabtube.activities.ShowChannelActivity; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.ChannelData.Channel; import app.fedilab.fedilabtube.helper.Helper; diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java index b8a8af1..3d18a6d 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java @@ -53,14 +53,13 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import app.fedilab.fedilabtube.PeertubeActivity; +import app.fedilab.fedilabtube.activities.PeertubeActivity; import app.fedilab.fedilabtube.R; -import app.fedilab.fedilabtube.ShowAccountActivity; +import app.fedilab.fedilabtube.activities.ShowAccountActivity; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.CommentData.Comment; import app.fedilab.fedilabtube.client.entities.Report; -import app.fedilab.fedilabtube.databinding.DrawerCommentBinding; import app.fedilab.fedilabtube.helper.CommentDecorationHelper; import app.fedilab.fedilabtube.helper.EmojiHelper; import app.fedilab.fedilabtube.helper.Helper; diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java index 1fe53c9..df3752f 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java @@ -54,10 +54,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import app.fedilab.fedilabtube.PeertubeActivity; -import app.fedilab.fedilabtube.PeertubeEditUploadActivity; +import app.fedilab.fedilabtube.activities.PeertubeActivity; +import app.fedilab.fedilabtube.activities.PeertubeEditUploadActivity; import app.fedilab.fedilabtube.R; -import app.fedilab.fedilabtube.ShowChannelActivity; +import app.fedilab.fedilabtube.activities.ShowChannelActivity; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData; diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java index 75d706d..ef49983 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube.drawer; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.MainActivity.badgeCount; +import static app.fedilab.fedilabtube.activities.MainActivity.badgeCount; import android.content.Context; import android.content.Intent; @@ -33,11 +33,11 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; -import app.fedilab.fedilabtube.AccountActivity; -import app.fedilab.fedilabtube.PeertubeActivity; +import app.fedilab.fedilabtube.activities.AccountActivity; +import app.fedilab.fedilabtube.activities.PeertubeActivity; import app.fedilab.fedilabtube.R; -import app.fedilab.fedilabtube.ShowAccountActivity; -import app.fedilab.fedilabtube.ShowChannelActivity; +import app.fedilab.fedilabtube.activities.ShowAccountActivity; +import app.fedilab.fedilabtube.activities.ShowChannelActivity; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData; import app.fedilab.fedilabtube.client.data.ChannelData; diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java index 347689b..ec7e606 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java @@ -54,11 +54,11 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutionException; -import app.fedilab.fedilabtube.AllPlaylistsActivity; +import app.fedilab.fedilabtube.activities.AllPlaylistsActivity; import app.fedilab.fedilabtube.BuildConfig; -import app.fedilab.fedilabtube.LocalPlaylistsActivity; -import app.fedilab.fedilabtube.MainActivity; -import app.fedilab.fedilabtube.PlaylistsActivity; +import app.fedilab.fedilabtube.activities.LocalPlaylistsActivity; +import app.fedilab.fedilabtube.activities.MainActivity; +import app.fedilab.fedilabtube.activities.PlaylistsActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; diff --git a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java index 00d3630..d86294e 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java +++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java @@ -14,7 +14,7 @@ package app.fedilab.fedilabtube.fragment; * You should have received a copy of the GNU General Public License along with TubeLab; if not, * see . */ -import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE; +import static app.fedilab.fedilabtube.activities.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE; import android.Manifest; import android.app.Activity; @@ -56,8 +56,6 @@ import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.ChannelData; import app.fedilab.fedilabtube.client.entities.ChannelParams; -import app.fedilab.fedilabtube.databinding.AddChannelBinding; -import app.fedilab.fedilabtube.databinding.FragmentRecyclerviewBinding; import app.fedilab.fedilabtube.drawer.ChannelListAdapter; import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.helper.HelperInstance; diff --git a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java index d8a4035..dc38921 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java +++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java @@ -54,7 +54,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import app.fedilab.fedilabtube.PlaylistsActivity; +import app.fedilab.fedilabtube.activities.PlaylistsActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; diff --git a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java index f3a37e3..113881d 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java +++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Map; import app.fedilab.fedilabtube.BuildConfig; -import app.fedilab.fedilabtube.MainActivity; +import app.fedilab.fedilabtube.activities.MainActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; diff --git a/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java b/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java index d4b4bde..951cb80 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java +++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java @@ -1,6 +1,6 @@ package app.fedilab.fedilabtube.fragment; -import static app.fedilab.fedilabtube.MainActivity.userMe; +import static app.fedilab.fedilabtube.activities.MainActivity.userMe; import android.content.Context; import android.content.Intent; @@ -37,7 +37,7 @@ import java.util.Map; import java.util.Set; import app.fedilab.fedilabtube.BuildConfig; -import app.fedilab.fedilabtube.MainActivity; +import app.fedilab.fedilabtube.activities.MainActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.entities.Error; diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java index 7f8737a..b2b3347 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java +++ b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java @@ -64,9 +64,9 @@ import java.util.List; import java.util.Locale; import java.util.regex.Pattern; -import app.fedilab.fedilabtube.MainActivity; +import app.fedilab.fedilabtube.activities.MainActivity; import app.fedilab.fedilabtube.R; -import app.fedilab.fedilabtube.WebviewActivity; +import app.fedilab.fedilabtube.activities.WebviewActivity; import app.fedilab.fedilabtube.client.data.AccountData.Account; import app.fedilab.fedilabtube.client.data.ChannelData; import app.fedilab.fedilabtube.client.data.VideoData; diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/PlaylistExportHelper.java b/app/src/main/java/app/fedilab/fedilabtube/helper/PlaylistExportHelper.java index 582ff14..df11d93 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/helper/PlaylistExportHelper.java +++ b/app/src/main/java/app/fedilab/fedilabtube/helper/PlaylistExportHelper.java @@ -26,7 +26,7 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.util.Scanner; -import app.fedilab.fedilabtube.AllLocalPlaylistsActivity; +import app.fedilab.fedilabtube.activities.AllLocalPlaylistsActivity; import app.fedilab.fedilabtube.client.data.VideoPlaylistData; import app.fedilab.fedilabtube.sqlite.ManagePlaylistsDAO; import app.fedilab.fedilabtube.sqlite.Sqlite; diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/SwitchAccountHelper.java b/app/src/main/java/app/fedilab/fedilabtube/helper/SwitchAccountHelper.java index 688e06a..e490541 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/helper/SwitchAccountHelper.java +++ b/app/src/main/java/app/fedilab/fedilabtube/helper/SwitchAccountHelper.java @@ -25,8 +25,8 @@ import androidx.appcompat.app.AlertDialog; import java.util.List; -import app.fedilab.fedilabtube.LoginActivity; -import app.fedilab.fedilabtube.MainActivity; +import app.fedilab.fedilabtube.activities.LoginActivity; +import app.fedilab.fedilabtube.activities.MainActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.client.data.AccountData; import app.fedilab.fedilabtube.drawer.OwnAccountsAdapter; diff --git a/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java b/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java index 8b221cc..8fa273b 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java +++ b/app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java @@ -41,10 +41,10 @@ import com.bumptech.glide.request.FutureTarget; import java.util.List; import java.util.concurrent.ExecutionException; -import app.fedilab.fedilabtube.MainActivity; -import app.fedilab.fedilabtube.PeertubeActivity; +import app.fedilab.fedilabtube.activities.MainActivity; +import app.fedilab.fedilabtube.activities.PeertubeActivity; import app.fedilab.fedilabtube.R; -import app.fedilab.fedilabtube.ShowAccountActivity; +import app.fedilab.fedilabtube.activities.ShowAccountActivity; import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.data.AccountData; diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index cd4bb5e..03861e5 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent" android:layout_margin="@dimen/fab_margin" android:scrollbars="none" - tools:context=".AboutActivity"> + tools:context=".activities.AboutActivity"> + tools:context=".activities.AccountActivity"> + tools:context=".activities.InstancePickerActivity"> + tools:context=".activities.MainActivity"> + tools:context=".activities.ManageInstancesActivity"> + tools:context=".activities.PeertubeActivity"> + tools:context=".activities.PeertubeUploadActivity"> + tools:context=".activities.PlaylistsActivity"> + tools:context=".activities.ShowChannelActivity"> + tools:context=".activities.SepiaSearchActivity"> + tools:context=".activities.ShowChannelActivity"> + tools:context=".activities.ShowChannelActivity"> + tools:context=".activities.MainActivity"> + tools:context=".activities.MainActivity">