Commit 22b7e571 authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop'

parents f3f9af2e 95b2b67f

README.md

+0 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ A multi-accounts client for Mastodon, Pleroma, Friendica and Pixelfed 
[![Weblate project translated](https://img.shields.io/weblate/progress/fedilab?server=https%3A%2F%2Fhosted.weblate.org&style=for-the-badge)](https://hosted.weblate.org/engage/fedilab/)

[![F-Droid Version](https://img.shields.io/f-droid/v/fr.gouv.etalab.mastodon?label=F-Droid&style=for-the-badge)](https://f-droid.org/app/fr.gouv.etalab.mastodon)

[![Liberapay patrons](https://img.shields.io/liberapay/patrons/tom79?label=Liberapay&style=for-the-badge)](https://liberapay.com/tom79/donate)

[![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/fedilab?label=Open%20Collective&style=for-the-badge)](https://opencollective.com/fedilab)



## Screenshots
@@ -32,7 +31,6 @@ A multi-accounts client for Mastodon, Pleroma, Friendica and Pixelfed 
## Donate



- [Liberapay](https://liberapay.com/tom79/donate)

- [Open Collective](https://opencollective.com/fedilab)

- [More...](https://fedilab.app/page/donations/)



## Resources

app/src/main/java/app/fedilab/android/activities/AboutActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ public class AboutActivity extends BaseBarActivity { 
        binding.aboutLicense.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.gnu.org/licenses/quick-guide-gplv3.fr.html"));

        binding.donateLiberapay.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://liberapay.com/tom79"));

        binding.donatePaypal.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.paypal.me/Mastalab"));

        binding.donateOpencollective.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://opencollective.com/fedilab"));



        binding.aboutVersionCopy.setOnClickListener(v -> {

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

+0 −1
Original line number Diff line number Diff line
@@ -2015,7 +2015,6 @@ public class Helper { 
                    binding.donationsMethods.setVisibility(View.VISIBLE);

                    binding.donateLiberapay.setOnClickListener(v -> Helper.openBrowser(activity, "https://liberapay.com/tom79"));

                    binding.donatePaypal.setOnClickListener(v -> Helper.openBrowser(activity, "https://www.paypal.me/Mastalab"));

                    binding.donateOpencollective.setOnClickListener(v -> Helper.openBrowser(activity, "https://opencollective.com/fedilab"));

                } else {

                    binding.donationsMethods.setVisibility(View.GONE);

                }

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

0 → 100644
+36 −0
Original line number Diff line number Diff line 
package app.fedilab.android.mastodon.helper;

/* Copyright 2026 Thomas Schneider

 *

 * This file is a part of Fedilab

 *

 * 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.

 *

 * Fedilab 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 Fedilab; if not,

 * see <http://www.gnu.org/licenses>. */



import android.content.Context;

import android.util.AttributeSet;



import androidx.viewpager.widget.ViewPager;



public class NonSwipeableViewPager extends ViewPager {



    public NonSwipeableViewPager(Context context) {

        super(context);

    }



    public NonSwipeableViewPager(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    @Override

    public boolean canScrollHorizontally(int direction) {

        return false;

    }

}

app/src/main/res/drawables/peertube/drawable/ic_opencollective.xml

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

    <path

        android:fillColor="@android:color/white"

        android:pathData="m88.49,53.86c0,6.8 -1.98,13.32 -5.37,18.71l13.86,13.89c6.79,-9.07 11.03,-20.41 11.03,-32.6 0,-12.19 -4.24,-23.53 -11.03,-32.6l-13.85,13.89c3.39,5.38 5.37,11.62 5.37,18.71z" />

    <path

        android:fillColor="@android:color/white"

        android:pathData="m54.01,88.44c-18.95,0 -34.5,-15.59 -34.5,-34.58 0,-18.99 15.55,-34.58 34.49,-34.58 7.07,0 13.29,1.98 18.67,5.67l13.85,-13.89c-9.05,-6.81 -20.36,-11.06 -32.52,-11.06 -29.69,0 -54.01,24.09 -54.01,54.14 0,30.05 24.32,53.86 54.01,53.86 12.44,0 23.75,-4.25 32.8,-11.06l-13.85,-13.89c-5.37,3.4 -11.88,5.38 -18.94,5.38z" />

</vector>