Commit c09a7a3c authored by Thomas's avatar Thomas
Browse files

improvements

parent 1b429a31

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

+190 −186

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −1
Original line number Diff line number Diff line
@@ -263,8 +263,9 @@ public class Account extends BaseAccount implements Serializable { 
        if (token.getRefresh_token() != null) {

            values.put(Sqlite.COL_REFRESH_TOKEN, token.getRefresh_token());

        }

        if (token.getAccess_token() != null)

        if (token.getAccess_token() != null) {

            values.put(Sqlite.COL_TOKEN, token.getAccess_token());

        }

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);

        String userId = sharedpreferences.getString(Helper.PREF_USER_ID, null);

        String instance = HelperInstance.getLiveInstance(context);

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

+2 −1
Original line number Diff line number Diff line
@@ -182,8 +182,9 @@ public class LoginActivity extends BaseBarActivity { 
            oauthParams.setPassword(binding.loginPasswd.getText().toString());

        }

        try {

            Log.v(TAG, "token: GET");

            Token token = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).manageToken(oauthParams);

            Log.v(TAG, "token: " + token);

            Log.v(TAG, ">token: " + token);

            proceedLogin(token, finalInstance);

        } catch (final Exception e) {

            oauthParams.setUsername(binding.loginUid.getText().toString().toLowerCase().trim());

app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java

+37 −25
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.view.WindowManager; 
import android.view.animation.Animation;

import android.view.animation.TranslateAnimation;

import android.view.inputmethod.InputMethodManager;

import android.webkit.WebView;

import android.widget.EditText;

import android.widget.ImageButton;

import android.widget.ImageView;
@@ -155,7 +156,6 @@ import app.fedilab.android.peertube.viewmodel.PlaylistsVM; 
import app.fedilab.android.peertube.viewmodel.PostActionsVM;

import app.fedilab.android.peertube.viewmodel.SearchVM;

import app.fedilab.android.peertube.viewmodel.TimelineVM;

import app.fedilab.android.peertube.webview.CustomWebview;

import app.fedilab.android.peertube.webview.MastalabWebChromeClient;

import app.fedilab.android.peertube.webview.MastalabWebViewClient;

import es.dmoral.toasty.Toasty;
@@ -209,6 +209,8 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        binding = ActivityPeertubeBinding.inflate(getLayoutInflater());

        setContentView(binding.getRoot());

        videoOrientationType = videoOrientation.LANDSCAPE;

        max_id = "0";

        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
@@ -306,7 +308,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
            binding.webviewVideo.setVisibility(View.VISIBLE);

            binding.mediaVideo.setVisibility(View.GONE);

            binding.doubleTapPlayerView.setVisibility(View.GONE);

            CustomWebview webview_video = Helper.initializeWebview(PeertubeActivity.this, R.id.webview_video, null);

            WebView webview_video = Helper.initializeWebview(PeertubeActivity.this, R.id.webview_video, null);



            MastalabWebChromeClient mastalabWebChromeClient = new MastalabWebChromeClient(PeertubeActivity.this, webview_video, binding.mainMediaFrame, binding.videoLayout);

            mastalabWebChromeClient.setOnToggledFullscreen(fullscreen -> {
@@ -1940,8 +1942,12 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
    private void initControllerButtons() {



        PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller);

        if (controlView == null) {

            return;

        }

        fullScreenIcon = controlView.findViewById(R.id.exo_fullscreen_icon);

        View fullScreenButton = controlView.findViewById(R.id.exo_fullscreen_button);

        if (fullScreenButton != null) {

            fullScreenButton.setOnClickListener(v -> {

                if (!fullScreenMode) {

                    openFullscreenDialog();
@@ -1950,18 +1956,23 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
                    setRequestedOrientationCustom(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);

                }

            });



        }

        ImageButton playButton = controlView.findViewById(R.id.exo_play);

        if (playButton != null) {

            playButton.setOnClickListener(v -> {

                if (autoFullscreen && !fullScreenMode) {

                    openFullscreenDialog();

                }

                player.setPlayWhenReady(true);

            });

        }

        View exo_next = controlView.findViewById(R.id.exo_next);

        if (exo_next != null) {

            exo_next.setOnClickListener(v -> playNextVideo());

        }



        View exoSettings = controlView.findViewById(R.id.exo_settings);

        if (exoSettings != null) {

            exoSettings.setOnClickListener(v -> {

                if (binding.videoParams.getVisibility() == View.VISIBLE) {

                    closeMainMenuOptions();
@@ -1969,6 +1980,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
                    openMainMenuOptions();

                }

            });

        }



    }

app/src/main/java/app/fedilab/android/peertube/activities/WebviewActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.view.MenuItem; 
import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.webkit.WebView;

import android.widget.FrameLayout;

import android.widget.Toast;
@@ -37,7 +38,6 @@ import org.jetbrains.annotations.NotNull; 
import app.fedilab.android.R;

import app.fedilab.android.mastodon.activities.BaseBarActivity;

import app.fedilab.android.peertube.helper.Helper;

import app.fedilab.android.peertube.webview.CustomWebview;

import app.fedilab.android.peertube.webview.MastalabWebChromeClient;

import app.fedilab.android.peertube.webview.MastalabWebViewClient;

import es.dmoral.toasty.Toasty;
@@ -47,7 +47,7 @@ public class WebviewActivity extends BaseBarActivity { 


    private String url;

    private boolean peertubeLink;

    private CustomWebview webView;

    private WebView webView;





    @SuppressLint("SetJavaScriptEnabled")