Commit 57532958 authored by Thomas's avatar Thomas
Browse files

Some fixes

parent a866f552

app/src/debug/res/xml/compose_shortcuts.xml

+1 −1
Original line number Diff line number Diff line 
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools">

    <shortcut

        android:shortcutId="compose"

        android:enabled="true"

        android:icon="@drawable/ic_baseline_add_comment_24"

        android:shortcutId="compose"

        android:shortcutShortLabel="@string/compose_shortcut_short_label1"

        tools:targetApi="n_mr1">

        <intent

app/src/fdroid/res/xml/compose_shortcuts.xml

+1 −1
Original line number Diff line number Diff line 
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools">

    <shortcut

        android:shortcutId="compose"

        android:enabled="true"

        android:icon="@drawable/ic_baseline_add_comment_24"

        android:shortcutId="compose"

        android:shortcutShortLabel="@string/compose_shortcut_short_label1"

        tools:targetApi="n_mr1">

        <intent

app/src/main/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ 
            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <action android:name="android.intent.action.MAIN" />



                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

            <meta-data

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

+768 −745

File changed.

Preview size limit exceeded, changes collapsed.

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

+10 −6
Original line number Diff line number Diff line
@@ -248,12 +248,16 @@ public class MastodonHelper { 
            String targetedUrl = disableGif ? (type == MediaAccountType.AVATAR ? account.avatar_static : account.header_static) : (type == MediaAccountType.AVATAR ? account.avatar : account.header);

            if (targetedUrl != null) {

                if (disableGif || (!targetedUrl.endsWith(".gif"))) {

                    try {

                        Glide.with(activity != null ? activity : context)

                                .asDrawable()

                                .load(targetedUrl)

                                .thumbnail(0.1f)

                                .placeholder(placeholder)

                                .into(view);

                    } catch (IllegalArgumentException e) {

                        e.printStackTrace();

                    }

                } else {

                    Glide.with(activity != null ? activity : context)

                            .asGif()