Commit a8f8f33a authored by Thomas's avatar Thomas
Browse files

fix orientation issue

parent 47b767e8

app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class BaseActivity extends AppCompatActivity { 
    @Override

    protected void attachBaseContext(Context newBase) {

        if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {

            final Configuration override = new Configuration(newBase.getResources().getConfiguration());

            final Configuration override = new Configuration();

            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);

            override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);

            applyOverrideConfiguration(override);

app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class BaseBarActivity extends AppCompatActivity { 
    protected void attachBaseContext(Context newBase) {



        if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {

            final Configuration override = new Configuration(newBase.getResources().getConfiguration());

            final Configuration override = new Configuration();

            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);

            override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);

            applyOverrideConfiguration(override);

app/src/main/java/app/fedilab/android/mastodon/activities/BaseTransparentActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class BaseTransparentActivity extends AppCompatActivity { 
    protected void attachBaseContext(Context newBase) {



        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {

            final Configuration override = new Configuration(newBase.getResources().getConfiguration());

            final Configuration override = new Configuration();

            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);

            override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);

            applyOverrideConfiguration(override);

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

+0 −9
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import static app.fedilab.android.BaseMainActivity.currentAccount; 
import static app.fedilab.android.BaseMainActivity.currentInstance;

import static app.fedilab.android.BaseMainActivity.currentToken;

import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;

import static app.fedilab.android.mastodon.helper.Helper.TAG;

import static app.fedilab.android.peertube.activities.PeertubeMainActivity.typeOfConnection;

import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.ADD_COMMENT;

import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.RATEVIDEO;
@@ -60,7 +59,6 @@ import android.text.TextPaint; 
import android.text.method.LinkMovementMethod;

import android.text.style.ClickableSpan;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.MenuItem;

import android.view.MotionEvent;
@@ -1500,8 +1498,6 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
        if (binding.minController.castMiniController.getVisibility() == View.VISIBLE) {

            return;

        }

        Log.v(TAG, "newConfig.orientation: " + newConfig.orientation);

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



        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {

            if (mode != Helper.VIDEO_MODE_WEBVIEW && !humanInteraction) {
@@ -1672,7 +1668,6 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
    public void toggleFullScreen() {

        fullScreenMode = !fullScreenMode;

        humanInteraction = true;

        Log.v(TAG, "toggleFullScreen: " + fullScreenMode);

        if (fullScreenMode) {

            if (getResources().getConfiguration().orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE && videoOrientationType == videoOrientation.PORTRAIT) {

                setRequestedOrientationCustom(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
@@ -1691,11 +1686,8 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
    }



    private void setFullScreen() {

        Log.v(TAG, "setFullScreen");

        fullScreenMode = true;

        fullScreenIcon.setImageDrawable(ContextCompat.getDrawable(PeertubeActivity.this, R.drawable.ic_baseline_fullscreen_exit_24));

        Log.v(TAG, "getResources().getConfiguration().orientation: " + getResources().getConfiguration().orientation);

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



        // Enables regular immersive mode.

        // For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE.
@@ -1717,7 +1709,6 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
    }



    private void disableFullScreen() {

        Log.v(TAG, "disableFullScreen");

        fullScreenMode = false;

        binding.bottomVideo.setVisibility(View.VISIBLE);

        fullScreenIcon.setImageDrawable(ContextCompat.getDrawable(PeertubeActivity.this, R.drawable.ic_baseline_fullscreen_24));