Commit c42c2fc6 authored by jordibgzashtita's avatar jordibgzashtita
Browse files

Merge remote-tracking branch 'master/develop' into jordibgzashtita

parents 7cf080ac 67c455f0

README.md

+33 −11
Original line number Diff line number Diff line 
[![Translation status](https://hosted.weblate.org/widgets/fedilab/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/fedilab/)

   [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)



# Fedilab is a multi-accounts client for Mastodon, Pleroma, Friendica and Pixelfed

<img src="src/fdroid/fastlane/metadata/android/en/images/icon.png" width="100"/>



# Fedilab

A multi-accounts client for Mastodon, Pleroma, Friendica and Pixelfed



## Donate



[<img alt="Donate using Liberapay" src="https://img.shields.io/liberapay/patrons/tom79.svg?logo=liberapay"/>](https://liberapay.com/tom79/donate)

[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=for-the-badge)](https://www.gnu.org/licenses/gpl-3.0)

[![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



<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/1.png" width="150"/>

&nbsp;&nbsp;

<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/2.png" width="150"/>

&nbsp;&nbsp;

<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/4.png" width="150"/>

&nbsp;&nbsp;

<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/7.png" width="150"/>



## Download



[<img alt='Get it on Google Play' src='./images/get-it-on-play.png' height="80"/>](https://play.google.com/store/apps/details?id=app.fedilab.android)

&nbsp;&nbsp;[<img alt='Get it on F-Droid' src='./images/get-it-on-fdroid.png' height="80"/>](https://f-droid.org/app/fr.gouv.etalab.mastodon)

<img src='https://img.shields.io/f-droid/v/fr.gouv.etalab.mastodon?include_prereleases' />

[<img alt='Get it on F-Droid' src='./images/get-it-on-fdroid.png' height="80"/>](https://f-droid.org/app/fr.gouv.etalab.mastodon)&nbsp;&nbsp;[<img alt='Get it on Google Play' src='./images/get-it-on-play.png' height="80"/>](https://play.google.com/store/apps/details?id=app.fedilab.android)



## Translate



- [Weblate](https://hosted.weblate.org/engage/fedilab/)



## Donate



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

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

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



## Resources



[WIKI](https://fedilab.app/wiki/home/)

- [Wiki](https://wiki.fedilab.app)

- [Releases + Changelogs](https://codeberg.org/tom79/Fedilab/releases)



[Release notes](https://codeberg.org/tom79/Fedilab/tags)

## Contact

- Fedi:<br>[toot.fedilab.app/@apps](https://toot.fedilab.app/@apps)



Lead developer: [toot.fedilab.app/@apps](https://toot.fedilab.app/@apps)

app/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 34

        versionCode 518

        versionName "3.29.2"

        versionCode 525

        versionName "3.31.1"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"
@@ -109,7 +109,7 @@ allprojects { 
    }

}

dependencies {

    implementation 'org.unifiedpush.android:connector:3.0.4'

    implementation 'org.unifiedpush.android:connector:3.0.7'



    playstoreImplementation('org.unifiedpush.android:embedded-fcm-distributor:3.0.0')

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    </queries>

    <application

        android:name="app.fedilab.android.MainApplication"

        android:allowBackup="true"

        android:allowBackup="false"

        android:dataExtractionRules="@xml/extraction_rules"

        android:fullBackupContent="@xml/backup_rules"

        android:configChanges="orientation|screenSize"

app/src/main/assets/release_notes/notes.json

+20 −0
Original line number Diff line number Diff line 
[

  {

    "version": "3.31.1",

    "code": "525",

    "note": "Added:\n- Add MinT machine translation system support\n\nFixed:\n- GIF not displayed in timelines\n- Fix a crash when unpinning timelines\n- Top bar coloring at scroll for conversations\n- Black screen when going back from the Peertube section"

  },

  {

    "version": "3.31.0",

    "code": "524",

    "note": "Added:\n- Pinned Trending Timeline (can be hidden in Manage Timelines)\n- Add a fallback to the default translator\n- New Pixelfed entry in Settings to disable fullscreen for media\n- Add tooltips for tabs in profiles\n\nChanged:\n- Increase touch area of reply buttons\n- Show a dialog after settings export\n\nFixed:\n- Fix media description not updated when there are several\n- Only a part of DeepL translations are shown\n- Fix Lingva truncated translations\n- Fix a crash when fetching remote profiles\n- Fix a crash with animated emoji\n- Fix a crash when displaying Home cache charts"

  },

  {

    "version": "3.30.1",

    "code": "523",

    "note": "Added:\n- Follow Twitter tags\n\nChange:\n- Remove automatic backup (Google only)\n\nFixed:\n- Push notifications not working for some devices\n- Filters not applied to media description\n- Fix a crash with animated images in timelines\n- Fix a crash for long threads\n- Fix a crash due to some messages (happened in different timelines)"

  },

  {

    "version": "3.30.0",

    "code": "522",

    "note": "Added:\n- Allow to follow the discover timelines of Pixelfed instances\n- Keep media proportions in timeline for Pixelfed\n- Add a like button in timelines for Pixelfed\n- Allow to login with a token\n\nChange:\n- Use Pixelfed layout when following Pixelfed instances\n- Allow to scroll buttons for larger screens in conversations\n- Move QR code into header\n\nFixed:\n- Not clickable URLs when Markdown is enabled\n- Nitter to follow Twitter accounts\n- Pixelfed timeline not displayed by default\n- Fix admin reports not accessible\n- Top bar coloring at scroll\n- Drafts not saved when adding/editing media descriptions\n- User search suggestions have duplicates\n- Some minor crashes"

  },

  {

    "version": "3.29.2",

    "code": "518",

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

+7 −8
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID; 
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;

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

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.mastodon.helper.Helper.displayReleaseNotesIfNeeded;

import static app.fedilab.android.mastodon.helper.ThemeHelper.fetchAccentColor;

import static app.fedilab.android.mastodon.ui.drawer.StatusAdapter.sendAction;
@@ -1463,7 +1462,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                bundle.putBoolean(Helper.ARG_PEERTUBE_NAV_REMOTE, true);

                intent.putExtras(bundle);

                startActivity(intent);

                finish();

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

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

            }
@@ -1527,14 +1525,14 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                    int[] to = new int[]{R.id.account_pp, R.id.account_un};

                    String searchGroup = matcherMention.group();

                    AccountsVM accountsVM = new ViewModelProvider(BaseMainActivity.this).get(AccountsVM.class);

                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                            SearchManager.SUGGEST_COLUMN_ICON_1,

                            SearchManager.SUGGEST_COLUMN_TEXT_1});

                    accountsVM.searchAccounts(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, 5, false, false)

                    accountsVM.searchAccounts(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, 10, false, false)

                            .observe(BaseMainActivity.this, accounts -> {

                                if (accounts == null) {

                                    return;

                                }

                                MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                                        SearchManager.SUGGEST_COLUMN_ICON_1,

                                        SearchManager.SUGGEST_COLUMN_TEXT_1});

                                AccountsSearchTopBarAdapter cursorAdapter = new AccountsSearchTopBarAdapter(BaseMainActivity.this, accounts, R.layout.drawer_account_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);

                                binding.toolbarSearch.setSuggestionsAdapter(cursorAdapter);

                                new Thread(() -> {
@@ -1562,8 +1560,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                    String[] from = new String[]{SearchManager.SUGGEST_COLUMN_TEXT_1};

                    int[] to = new int[]{R.id.tag_name};

                    String searchGroup = matcherTag.group();

                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                            SearchManager.SUGGEST_COLUMN_TEXT_1});



                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, null,

                            "hashtags", false, true, false, 0,

                            null, null, 10).observe(BaseMainActivity.this,
@@ -1571,6 +1568,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                                if (results == null || results.hashtags == null) {

                                    return;

                                }

                                MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                                        SearchManager.SUGGEST_COLUMN_TEXT_1});

                                TagSearchTopBarAdapter cursorAdapter = new TagSearchTopBarAdapter(BaseMainActivity.this, results.hashtags, R.layout.drawer_tag_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);

                                binding.toolbarSearch.setSuggestionsAdapter(cursorAdapter);

                                int i = 0;