Commit e28b3fcf authored by Thomas's avatar Thomas
Browse files

Add some elements

parent 20c79752

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

+6 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,12 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            } else if (id == R.id.nav_cache) {

                Intent intent = new Intent(BaseMainActivity.this, CacheActivity.class);

                startActivity(intent);

            } else if (id == R.id.nav_peertube) {

                Intent intent = new Intent(BaseMainActivity.this, PeertubeMainActivity.class);

                Bundle bundle = new Bundle();

                bundle.putBoolean(Helper.ARG_PEERTUBE_NAV_REMOTE, true);

                intent.putExtras(bundle);

                startActivity(intent);

            } else if (id == R.id.nav_about_instance) {

                (new InstanceActivity()).show(getSupportFragmentManager(), null);

            }

app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ public class Helper { 
    public static final String RECEIVE_REDRAW_PROFILE = "RECEIVE_REDRAW_PROFILE";



    public static final String ARG_TIMELINE_TYPE = "ARG_TIMELINE_TYPE";

    public static final String ARG_PEERTUBE_NAV_REMOTE = "ARG_PEERTUBE_NAV_REMOTE";



    public static final String ARG_REMOTE_INSTANCE_STRING = "ARG_REMOTE_INSTANCE_STRING";



    public static final String ARG_NOTIFICATION_TYPE = "ARG_NOTIFICATION_TYPE";

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

+229 −11

File changed.

Preview size limit exceeded, changes collapsed.

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

+15 −2
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
        super.onCreate(savedInstanceState);

        binding = super.binding;





        Intent intentActvity = getIntent();

        if (intentActvity != null) {

            Bundle extras = intentActvity.getExtras();

            String userIdIntent, instanceIntent, urlOfMessage;

            if (extras != null && extras.containsKey(app.fedilab.android.mastodon.helper.Helper.ARG_PEERTUBE_NAV_REMOTE)) {

                if (extras.getBoolean(app.fedilab.android.mastodon.helper.Helper.ARG_PEERTUBE_NAV_REMOTE)) {

                    typeOfConnection = PeertubeMainActivity.TypeOfConnection.REMOTE_ACCOUNT;

                }

            }

        }

        Toolbar toolbar = findViewById(R.id.toolbar);

        setSupportActionBar(toolbar);
@@ -274,7 +285,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 
                if (typeOfConnection == TypeOfConnection.SURFING) {

                    switchDialog(PeertubeMainActivity.this, false);

                } else {

                    if (Helper.isLoggedIn()) {

                    if (Helper.canMakeAction()) {

                        intent = new Intent(PeertubeMainActivity.this, AccountActivity.class);

                        startActivity(intent);

                        overridePendingTransition(R.anim.slide_in_up, R.anim.slide_out_up);
@@ -571,6 +582,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 


        MenuItem incognitoItem = menu.findItem(R.id.action_incognito);

        switch (typeOfConnection) {

            case REMOTE_ACCOUNT:

            case NORMAL:

                if (Helper.isLoggedIn()) {

                    incognitoItem.setVisible(true);
@@ -729,7 +741,8 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { 


    public enum TypeOfConnection {

        NORMAL,

        SURFING

        SURFING,

        REMOTE_ACCOUNT

    }



    private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {

app/src/main/java/app/fedilab/android/peertube/drawer/CommentListAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo 
            holder.binding.postReplyButton.setVisibility(View.GONE);

        }

        holder.binding.postReplyButton.setOnClickListener(v -> {

            if (Helper.isLoggedIn() && !sepiaSearch) {

            if (Helper.canMakeAction() && !sepiaSearch) {

                ((PeertubeActivity) context).openPostComment(comment, i);

            } else {

                if (sepiaSearch) {
@@ -308,7 +308,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo 
            }



        });

        if (Helper.isLoggedIn() && !sepiaSearch) {

        if (Helper.canMakeAction() && !sepiaSearch) {

            holder.binding.replyButton.setVisibility(View.VISIBLE);

        } else {

            holder.binding.replyButton.setVisibility(View.GONE);