Loading app/src/main/AndroidManifest.xml +6 −0 Original line number Diff line number Diff line Loading @@ -167,6 +167,8 @@ android:scheme="fedilab" /> </intent-filter> </activity> <activity android:name=".mastodon.activities.StatusHistoryActivity" android:configChanges="keyboardHidden|orientation|screenSize" Loading Loading @@ -371,6 +373,10 @@ </receiver> <activity android:name=".peertube.activities.PeertubeMainActivity" android:configChanges="keyboardHidden|orientation|screenSize" /> <activity android:name=".peertube.activities.PeertubeActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" Loading app/src/main/java/app/fedilab/android/MainApplication.java +1 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ import es.dmoral.toasty.Toasty; public class MainApplication extends MultiDexApplication { public static String UPLOAD_CHANNEL_ID = "upload_info_peertube"; private static MainApplication app; private WebView webView; Loading app/src/main/java/app/fedilab/android/peertube/activities/AccountActivity.java +6 −6 Original line number Diff line number Diff line Loading @@ -14,7 +14,7 @@ package app.fedilab.android.peertube.activities; * 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.android.peertube.activities.MainActivity.badgeCount; import static app.fedilab.android.peertube.activities.PeertubeMainActivity.badgeCount; import android.content.Intent; import android.content.SharedPreferences; Loading Loading @@ -44,8 +44,8 @@ import com.google.android.material.tabs.TabLayout; import org.jetbrains.annotations.NotNull; import app.fedilab.android.R; import app.fedilab.android.databinding.ActivityAccountBinding; import app.fedilab.android.mastodon.activities.BaseActivity; import app.fedilab.android.databinding.ActivityAccountPeertubeBinding; import app.fedilab.android.mastodon.activities.BaseBarActivity; import app.fedilab.android.peertube.client.RetrofitPeertubeAPI; import app.fedilab.android.peertube.client.data.AccountData.Account; import app.fedilab.android.peertube.fragment.DisplayAccountsFragment; Loading @@ -57,15 +57,15 @@ import app.fedilab.android.peertube.sqlite.AccountDAO; import app.fedilab.android.peertube.sqlite.Sqlite; public class AccountActivity extends BaseActivity { public class AccountActivity extends BaseBarActivity { private ActivityAccountBinding binding; private ActivityAccountPeertubeBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = ActivityAccountBinding.inflate(getLayoutInflater()); binding = ActivityAccountPeertubeBinding.inflate(getLayoutInflater()); View view = binding.getRoot(); setContentView(view); if (getSupportActionBar() != null) Loading app/src/main/java/app/fedilab/android/peertube/activities/AllLocalPlaylistsActivity.java +4 −6 Original line number Diff line number Diff line Loading @@ -30,16 +30,15 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.ArrayList; import java.util.List; import app.fedilab.android.peertube.R; import app.fedilab.android.R; import app.fedilab.android.mastodon.activities.BaseBarActivity; import app.fedilab.android.peertube.client.data.PlaylistData.Playlist; import app.fedilab.android.peertube.client.data.VideoPlaylistData; import app.fedilab.android.peertube.drawer.PlaylistAdapter; import app.fedilab.android.peertube.helper.HelperInstance; import app.fedilab.android.peertube.helper.Theme; import app.fedilab.android.peertube.viewmodel.PlaylistsVM; public class AllLocalPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved { public class AllLocalPlaylistsActivity extends BaseBarActivity implements PlaylistAdapter.AllPlaylistRemoved { PlaylistAdapter playlistAdapter; Loading @@ -50,9 +49,8 @@ public class AllLocalPlaylistsActivity extends BaseActivity implements PlaylistA @Override protected void onCreate(Bundle savedInstanceState) { Theme.setTheme(this, HelperInstance.getLiveInstance(this), false); super.onCreate(savedInstanceState); setContentView(R.layout.activity_all_playlist); setContentView(R.layout.activity_all_playlist_peertube); if (getSupportActionBar() != null) getSupportActionBar().setDisplayHomeAsUpEnabled(true); Loading app/src/main/java/app/fedilab/android/peertube/activities/AllPlaylistsActivity.java +9 −11 Original line number Diff line number Diff line Loading @@ -55,25 +55,24 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import app.fedilab.android.peertube.R; import app.fedilab.android.R; import app.fedilab.android.databinding.ActivityAllPlaylistPeertubeBinding; import app.fedilab.android.databinding.AddPlaylistPeertubeBinding; import app.fedilab.android.mastodon.activities.BaseBarActivity; import app.fedilab.android.peertube.client.APIResponse; import app.fedilab.android.peertube.client.RetrofitPeertubeAPI; import app.fedilab.android.peertube.client.data.ChannelData; import app.fedilab.android.peertube.client.data.PlaylistData.Playlist; import app.fedilab.android.peertube.client.entities.Item; import app.fedilab.android.peertube.client.entities.PlaylistParams; import app.fedilab.android.peertube.databinding.ActivityAllPlaylistBinding; import app.fedilab.android.peertube.databinding.AddPlaylistBinding; import app.fedilab.android.peertube.drawer.PlaylistAdapter; import app.fedilab.android.peertube.helper.Helper; import app.fedilab.android.peertube.helper.HelperInstance; import app.fedilab.android.peertube.helper.Theme; import app.fedilab.android.peertube.viewmodel.ChannelsVM; import app.fedilab.android.peertube.viewmodel.PlaylistsVM; import es.dmoral.toasty.Toasty; public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved { public class AllPlaylistsActivity extends BaseBarActivity implements PlaylistAdapter.AllPlaylistRemoved { private static final int PICK_AVATAR = 467; Loading @@ -84,16 +83,15 @@ public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapte private Playlist playlistToEdit; private List<ChannelData.Channel> myChannels; private ChannelData.Channel selectedChannel; private AddPlaylistBinding bindingDialog; private AddPlaylistPeertubeBinding bindingDialog; private Uri inputData; private ActivityAllPlaylistBinding binding; private ActivityAllPlaylistPeertubeBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Theme.setTheme(this, HelperInstance.getLiveInstance(this), false); binding = ActivityAllPlaylistBinding.inflate(getLayoutInflater()); binding = ActivityAllPlaylistPeertubeBinding.inflate(getLayoutInflater()); View viewRoot = binding.getRoot(); setContentView(viewRoot); Loading Loading @@ -163,7 +161,7 @@ public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapte playlistToEdit = playlistParam; AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(AllPlaylistsActivity.this); bindingDialog = AddPlaylistBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false); bindingDialog = AddPlaylistPeertubeBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false); dialogBuilder.setView(bindingDialog.getRoot()); dialogBuilder.setView(bindingDialog.getRoot()); Loading Loading
app/src/main/AndroidManifest.xml +6 −0 Original line number Diff line number Diff line Loading @@ -167,6 +167,8 @@ android:scheme="fedilab" /> </intent-filter> </activity> <activity android:name=".mastodon.activities.StatusHistoryActivity" android:configChanges="keyboardHidden|orientation|screenSize" Loading Loading @@ -371,6 +373,10 @@ </receiver> <activity android:name=".peertube.activities.PeertubeMainActivity" android:configChanges="keyboardHidden|orientation|screenSize" /> <activity android:name=".peertube.activities.PeertubeActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" Loading
app/src/main/java/app/fedilab/android/MainApplication.java +1 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ import es.dmoral.toasty.Toasty; public class MainApplication extends MultiDexApplication { public static String UPLOAD_CHANNEL_ID = "upload_info_peertube"; private static MainApplication app; private WebView webView; Loading
app/src/main/java/app/fedilab/android/peertube/activities/AccountActivity.java +6 −6 Original line number Diff line number Diff line Loading @@ -14,7 +14,7 @@ package app.fedilab.android.peertube.activities; * 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.android.peertube.activities.MainActivity.badgeCount; import static app.fedilab.android.peertube.activities.PeertubeMainActivity.badgeCount; import android.content.Intent; import android.content.SharedPreferences; Loading Loading @@ -44,8 +44,8 @@ import com.google.android.material.tabs.TabLayout; import org.jetbrains.annotations.NotNull; import app.fedilab.android.R; import app.fedilab.android.databinding.ActivityAccountBinding; import app.fedilab.android.mastodon.activities.BaseActivity; import app.fedilab.android.databinding.ActivityAccountPeertubeBinding; import app.fedilab.android.mastodon.activities.BaseBarActivity; import app.fedilab.android.peertube.client.RetrofitPeertubeAPI; import app.fedilab.android.peertube.client.data.AccountData.Account; import app.fedilab.android.peertube.fragment.DisplayAccountsFragment; Loading @@ -57,15 +57,15 @@ import app.fedilab.android.peertube.sqlite.AccountDAO; import app.fedilab.android.peertube.sqlite.Sqlite; public class AccountActivity extends BaseActivity { public class AccountActivity extends BaseBarActivity { private ActivityAccountBinding binding; private ActivityAccountPeertubeBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = ActivityAccountBinding.inflate(getLayoutInflater()); binding = ActivityAccountPeertubeBinding.inflate(getLayoutInflater()); View view = binding.getRoot(); setContentView(view); if (getSupportActionBar() != null) Loading
app/src/main/java/app/fedilab/android/peertube/activities/AllLocalPlaylistsActivity.java +4 −6 Original line number Diff line number Diff line Loading @@ -30,16 +30,15 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.ArrayList; import java.util.List; import app.fedilab.android.peertube.R; import app.fedilab.android.R; import app.fedilab.android.mastodon.activities.BaseBarActivity; import app.fedilab.android.peertube.client.data.PlaylistData.Playlist; import app.fedilab.android.peertube.client.data.VideoPlaylistData; import app.fedilab.android.peertube.drawer.PlaylistAdapter; import app.fedilab.android.peertube.helper.HelperInstance; import app.fedilab.android.peertube.helper.Theme; import app.fedilab.android.peertube.viewmodel.PlaylistsVM; public class AllLocalPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved { public class AllLocalPlaylistsActivity extends BaseBarActivity implements PlaylistAdapter.AllPlaylistRemoved { PlaylistAdapter playlistAdapter; Loading @@ -50,9 +49,8 @@ public class AllLocalPlaylistsActivity extends BaseActivity implements PlaylistA @Override protected void onCreate(Bundle savedInstanceState) { Theme.setTheme(this, HelperInstance.getLiveInstance(this), false); super.onCreate(savedInstanceState); setContentView(R.layout.activity_all_playlist); setContentView(R.layout.activity_all_playlist_peertube); if (getSupportActionBar() != null) getSupportActionBar().setDisplayHomeAsUpEnabled(true); Loading
app/src/main/java/app/fedilab/android/peertube/activities/AllPlaylistsActivity.java +9 −11 Original line number Diff line number Diff line Loading @@ -55,25 +55,24 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import app.fedilab.android.peertube.R; import app.fedilab.android.R; import app.fedilab.android.databinding.ActivityAllPlaylistPeertubeBinding; import app.fedilab.android.databinding.AddPlaylistPeertubeBinding; import app.fedilab.android.mastodon.activities.BaseBarActivity; import app.fedilab.android.peertube.client.APIResponse; import app.fedilab.android.peertube.client.RetrofitPeertubeAPI; import app.fedilab.android.peertube.client.data.ChannelData; import app.fedilab.android.peertube.client.data.PlaylistData.Playlist; import app.fedilab.android.peertube.client.entities.Item; import app.fedilab.android.peertube.client.entities.PlaylistParams; import app.fedilab.android.peertube.databinding.ActivityAllPlaylistBinding; import app.fedilab.android.peertube.databinding.AddPlaylistBinding; import app.fedilab.android.peertube.drawer.PlaylistAdapter; import app.fedilab.android.peertube.helper.Helper; import app.fedilab.android.peertube.helper.HelperInstance; import app.fedilab.android.peertube.helper.Theme; import app.fedilab.android.peertube.viewmodel.ChannelsVM; import app.fedilab.android.peertube.viewmodel.PlaylistsVM; import es.dmoral.toasty.Toasty; public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved { public class AllPlaylistsActivity extends BaseBarActivity implements PlaylistAdapter.AllPlaylistRemoved { private static final int PICK_AVATAR = 467; Loading @@ -84,16 +83,15 @@ public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapte private Playlist playlistToEdit; private List<ChannelData.Channel> myChannels; private ChannelData.Channel selectedChannel; private AddPlaylistBinding bindingDialog; private AddPlaylistPeertubeBinding bindingDialog; private Uri inputData; private ActivityAllPlaylistBinding binding; private ActivityAllPlaylistPeertubeBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Theme.setTheme(this, HelperInstance.getLiveInstance(this), false); binding = ActivityAllPlaylistBinding.inflate(getLayoutInflater()); binding = ActivityAllPlaylistPeertubeBinding.inflate(getLayoutInflater()); View viewRoot = binding.getRoot(); setContentView(viewRoot); Loading Loading @@ -163,7 +161,7 @@ public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapte playlistToEdit = playlistParam; AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(AllPlaylistsActivity.this); bindingDialog = AddPlaylistBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false); bindingDialog = AddPlaylistPeertubeBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false); dialogBuilder.setView(bindingDialog.getRoot()); dialogBuilder.setView(bindingDialog.getRoot()); Loading