Commit 867d2ed4 authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop' into main

parents 17ae8a24 ea8f4979

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -10,3 +10,5 @@ 
local.properties

/cropper/build/

/build/

/app/fdroid/release/

/app/playstore/release/

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 31

        versionCode 395

        versionName "3.0.5"

        versionCode 396

        versionName "3.0.6"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

app/src/fdroid/res/xml/file_paths.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<paths>

    <external-path

        name="my_images"

        path="Android/data/fr.gouv.etalab.mastodon.test/files/Pictures" />

        path="Android/data/fr.gouv.etalab.mastodon/files/Pictures" />



    <cache-path

        name="*"

app/src/main/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ 
            android:configChanges="keyboardHidden|orientation|screenSize"

            android:theme="@style/AppThemeBar"

            android:label="@string/search" />

        <activity

            android:name=".activities.TrendsActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/trending"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.ReorderTimelinesActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

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

+31 −21
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ import app.fedilab.android.activities.ReorderTimelinesActivity; 
import app.fedilab.android.activities.ScheduledActivity;

import app.fedilab.android.activities.SearchResultTabActivity;

import app.fedilab.android.activities.SettingsActivity;

import app.fedilab.android.activities.TrendsActivity;

import app.fedilab.android.broadcastreceiver.NetworkStateReceiver;

import app.fedilab.android.client.entities.api.Emoji;

import app.fedilab.android.client.entities.api.EmojiInstance;
@@ -509,6 +510,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            } else if (id == R.id.nav_announcements) {

                Intent intent = new Intent(this, AnnouncementActivity.class);

                startActivity(intent);

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

                Intent intent = new Intent(this, TrendsActivity.class);

                startActivity(intent);

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

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

                startActivity(intent);
@@ -900,11 +904,13 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            itemFilter.setTitle(show_filtered);

        }

        popup.setOnDismissListener(menu1 -> {

            Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());

            if (binding.viewPager.getAdapter() != null) {

                Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());

                if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {

                    FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);

                    fragmentMastodonTimeline.refreshAllAdapters();

                }

            }

        });

        String finalShow_filtered = show_filtered;

        popup.setOnMenuItemClickListener(item -> {
@@ -990,7 +996,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
    }



    public void refreshFragment() {

        Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());

        if (binding.viewPager.getAdapter() != null) {

            Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());

            if (fragment instanceof FragmentNotificationContainer) {

                FragmentTransaction fragTransaction = getSupportFragmentManager().beginTransaction();

                fragTransaction.detach(fragment).commit();
@@ -999,6 +1006,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                fragTransaction2.commit();

            }

        }

    }



    @Override

    protected void onDestroy() {
@@ -1035,7 +1043,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
     */

    private void scrollToTop() {



        Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());

        if (binding.viewPager.getAdapter() != null) {

            Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());

            if (fragment instanceof FragmentMastodonTimeline) {

                FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);

                fragmentMastodonTimeline.scrollToTop();
@@ -1047,6 +1056,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                fragmentNotificationContainer.scrollToTop();

            }

        }

    }





    @Override