Peertube/TubeLab-App-Android
1
0
Fork 0
mirror of https://framagit.org/tom79/fedilab-tube synced 2025-04-13 01:52:01 +02:00
Code Issues Releases Wiki Activity

theming

Browse Source
This commit is contained in:
Thomas 2022-05-05 08:53:25 +02:00
parent 2456e8f782
commit fcb1974e78
66 changed files with 230 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -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'

26
app/src/acad/java/app/fedilab/fedilabtube/activities/BaseActivity.java Normal file
View File

@ -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 <http://www.gnu.org/licenses>. */
import android.os.Bundle;
import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity;
public class BaseActivity extends CyaneaAppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
}

2
app/src/fdroid_acad/AndroidManifest.xml
View File

@ -15,7 +15,7 @@
tools:replace="android:allowBackup">
<activity
android:name=".MainActivity"
android:name=".activities.MainActivity"
tools:node="merge">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

2
app/src/fdroid_full/AndroidManifest.xml
View File

@ -15,7 +15,7 @@
tools:replace="android:allowBackup">
<activity
android:name=".PeertubeActivity"
android:name=".activities.PeertubeActivity"
tools:node="mergeOnlyAttributes">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

26
app/src/full/java/app/fedilab/fedilabtube/activities/BaseActivity.java Normal file
View File

@ -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 <http://www.gnu.org/licenses>. */
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
public class BaseActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
}

2
app/src/google_acad/AndroidManifest.xml
View File

@ -15,7 +15,7 @@
tools:replace="android:allowBackup">
<activity
android:name=".MainActivity"
android:name=".activities.MainActivity"
tools:node="merge"
android:exported="true">
<intent-filter>

3
app/src/google_cast_lib/java/app/fedilab/fedilabtube/BaseMainActivity.java
View File

@ -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;

3
app/src/google_cast_lib/java/app/fedilab/fedilabtube/BasePeertubeActivity.java
View File

@ -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;

2
app/src/google_donation/res/layout/activity_donation.xml
View File

@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ShowChannelActivity">
tools:context=".activities.ShowChannelActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

4
app/src/google_full/AndroidManifest.xml
View File

@ -15,7 +15,7 @@
tools:replace="android:allowBackup">
<activity
android:name=".PeertubeActivity"
android:name=".activities.PeertubeActivity"
tools:node="merge">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -30,7 +30,7 @@
</intent-filter>
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".PeertubeActivity" />
android:value=".activities.PeertubeActivity" />
</activity>
<activity

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

@ -28,7 +28,7 @@
android:theme="@style/AppTheme"
tools:replace="android:allowBackup">
<activity
android:name=".MainActivity"
android:name=".activities.MainActivity"
android:theme="@style/AppThemeNoActionBar"
android:configChanges="orientation|screenSize"
android:exported="true">
@ -41,85 +41,85 @@
<activity
android:name=".PeertubeActivity"
android:name=".activities.PeertubeActivity"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
android:launchMode="singleTask"
android:resizeableActivity="true"
android:supportsPictureInPicture="true"
tools:targetApi="n" />
<activity
android:name=".PeertubeEditUploadActivity"
android:name=".activities.PeertubeEditUploadActivity"
android:configChanges="orientation|screenSize"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".ShowChannelActivity"
android:name=".activities.ShowChannelActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".ShowAccountActivity"
android:name=".activities.ShowAccountActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".AccountActivity"
android:name=".activities.AccountActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".MyAccountActivity"
android:name=".activities.MyAccountActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".SearchActivity"
android:name=".activities.SearchActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".AllPlaylistsActivity"
android:name=".activities.AllPlaylistsActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".AllLocalPlaylistsActivity"
android:name=".activities.AllLocalPlaylistsActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".InstancePickerActivity"
android:name=".activities.InstancePickerActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".PlaylistsActivity"
android:name=".activities.PlaylistsActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".LocalPlaylistsActivity"
android:name=".activities.LocalPlaylistsActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".VideosTimelineActivity"
android:name=".activities.VideosTimelineActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".SepiaSearchActivity"
android:name=".activities.SepiaSearchActivity"
android:configChanges="orientation|screenSize"
android:label="@string/sepia_search"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".ManageInstancesActivity"
android:name=".activities.ManageInstancesActivity"
android:configChanges="orientation|screenSize"
android:label="@string/instances_picker"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".WebviewActivity"
android:name=".activities.WebviewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity
android:name=".WebviewConnectActivity"
android:name=".activities.WebviewConnectActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity
android:name=".MastodonWebviewConnectActivity"
android:name=".activities.MastodonWebviewConnectActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity
android:name=".LoginActivity"
android:name=".activities.LoginActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden"
android:exported="true">
@ -136,22 +136,22 @@
</activity>
<activity
android:name=".SettingsActivity"
android:name=".activities.SettingsActivity"
android:configChanges="orientation|screenSize"
android:label="@string/settings"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".PeertubeRegisterActivity"
android:name=".activities.PeertubeRegisterActivity"
android:configChanges="orientation|screenSize"
android:label="@string/register_account"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".PeertubeUploadActivity"
android:name=".activities.PeertubeUploadActivity"
android:configChanges="orientation|screenSize"
android:label="@string/upload_video"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".AboutActivity"
android:name=".activities.AboutActivity"
android:configChanges="orientation|screenSize"
android:label="@string/about_the_app"
android:windowSoftInputMode="stateAlwaysHidden" />

2
app/src/main/java/app/fedilab/fedilabtube/BaseFedilabTube.java
View File

@ -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() {

6
app/src/main/java/app/fedilab/fedilabtube/AboutActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java
View File

@ -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

7
app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

5
app/src/main/java/app/fedilab/fedilabtube/AllLocalPlaylistsActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java
View File

@ -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;

8
app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

6
app/src/main/java/app/fedilab/fedilabtube/InstancePickerActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java
View File

@ -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;

3
app/src/main/java/app/fedilab/fedilabtube/LocalPlaylistsActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java
View File

@ -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;

6
app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java
View File

@ -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;

13
app/src/main/java/app/fedilab/fedilabtube/MainActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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();
}
}

10
app/src/main/java/app/fedilab/fedilabtube/ManageInstancesActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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<InstanceData.AboutInstance> aboutInstances;

5
app/src/main/java/app/fedilab/fedilabtube/MastodonWebviewConnectActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java
View File

@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
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;

7
app/src/main/java/app/fedilab/fedilabtube/MyAccountActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

6
app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java
View File

@ -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;

5
app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java
View File

@ -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;

8
app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

12
app/src/main/java/app/fedilab/fedilabtube/PeertubeUploadActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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);
}
}

5
app/src/main/java/app/fedilab/fedilabtube/PlaylistsActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java
View File

@ -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;

5
app/src/main/java/app/fedilab/fedilabtube/SearchActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java
View File

@ -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;

7
app/src/main/java/app/fedilab/fedilabtube/SepiaSearchActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

4
app/src/main/java/app/fedilab/fedilabtube/SettingsActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
public class SettingsActivity extends AppCompatActivity {
public class SettingsActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {

5
app/src/main/java/app/fedilab/fedilabtube/ShowAccountActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java
View File

@ -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;

7
app/src/main/java/app/fedilab/fedilabtube/ShowChannelActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

5
app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java
View File

@ -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;

5
app/src/main/java/app/fedilab/fedilabtube/WebviewActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java
View File

@ -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;

6
app/src/main/java/app/fedilab/fedilabtube/WebviewConnectActivity.java → app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java
View File

@ -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;

2
app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
View File

@ -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;

2
app/src/main/java/app/fedilab/fedilabtube/client/mastodon/RetrofitMastodonAPI.java
View File

@ -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;

2
app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java
View File

@ -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;

4
app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java
View File

@ -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;

5
app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java
View File

@ -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;

6
app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
View File

@ -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;

10
app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

8
app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java
View File

@ -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;

4
app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java
View File

@ -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 <http://www.gnu.org/licenses>. */
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;

2
app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java
View File

@ -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;

2
app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java
View File

@ -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;

4
app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java
View File

@ -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;

4
app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
View File

@ -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;

2
app/src/main/java/app/fedilab/fedilabtube/helper/PlaylistExportHelper.java
View File

@ -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;

4
app/src/main/java/app/fedilab/fedilabtube/helper/SwitchAccountHelper.java
View File

@ -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;

6
app/src/main/java/app/fedilab/fedilabtube/worker/NotificationsWorker.java
View File

@ -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;

2
app/src/main/res/layout/activity_about.xml
View File

@ -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">
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_account.xml
View File

@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".AccountActivity">
tools:context=".activities.AccountActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_instance_picker.xml
View File

@ -24,7 +24,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".InstancePickerActivity">
tools:context=".activities.InstancePickerActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_main.xml
View File

@ -27,7 +27,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
tools:context=".activities.MainActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"

2
app/src/main/res/layout/activity_manage_instances.xml
View File

@ -24,7 +24,7 @@
android:layout_height="match_parent"
android:layout_margin="@dimen/fab_margin"
android:scrollbars="none"
tools:context=".ManageInstancesActivity">
tools:context=".activities.ManageInstancesActivity">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/lv_instances"

2
app/src/main/res/layout/activity_peertube.xml
View File

@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true"
tools:context=".PeertubeActivity">
tools:context=".activities.PeertubeActivity">
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_peertube_upload.xml
View File

@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".PeertubeUploadActivity">
tools:context=".activities.PeertubeUploadActivity">
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_playlists.xml
View File

@ -24,7 +24,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".PlaylistsActivity">
tools:context=".activities.PlaylistsActivity">
<fragment
app:layout_behavior="@string/appbar_scrolling_view_behavior"

2
app/src/main/res/layout/activity_search_result.xml
View File

@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ShowChannelActivity">
tools:context=".activities.ShowChannelActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_sepia_search.xml
View File

@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".SepiaSearchActivity">
tools:context=".activities.SepiaSearchActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/activity_show_account.xml
View File

@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ShowChannelActivity">
tools:context=".activities.ShowChannelActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_show_channel.xml
View File

@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ShowChannelActivity">
tools:context=".activities.ShowChannelActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/fragment_overview.xml
View File

@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
tools:context=".MainActivity">
tools:context=".activities.MainActivity">
<FrameLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/fragment_video.xml
View File

@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
tools:context=".MainActivity">
tools:context=".activities.MainActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/top_account_container"