Commit a9da1752 authored by Thomas's avatar Thomas
Browse files

New logos

parent 23cce968

app/src/main/AndroidManifest.xml

+54 −0
Original line number Diff line number Diff line
@@ -131,6 +131,60 @@ 
                android:resource="@xml/compose_shortcuts" />

        </activity-alias>



        <activity-alias

            android:name=".activities.MainActivity.BubblesPride"

            android:enabled="false"

            android:exported="true"

            android:icon="@mipmap/ic_launcher_bubbles_pride"

            android:roundIcon="@mipmap/ic_launcher_bubbles_pride_round"

            android:targetActivity=".activities.MainActivity">

            <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

                android:name="android.app.shortcuts"

                android:resource="@xml/compose_shortcuts" />

        </activity-alias>



        <activity-alias

            android:name=".activities.MainActivity.BubblesPink"

            android:enabled="false"

            android:exported="true"

            android:icon="@mipmap/ic_launcher_bubbles_pink"

            android:roundIcon="@mipmap/ic_launcher_bubbles_pink_round"

            android:targetActivity=".activities.MainActivity">

            <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

                android:name="android.app.shortcuts"

                android:resource="@xml/compose_shortcuts" />

        </activity-alias>



        <activity-alias

            android:name=".activities.MainActivity.BubblesPirate"

            android:enabled="false"

            android:exported="true"

            android:icon="@mipmap/ic_launcher_bubbles_pirate"

            android:roundIcon="@mipmap/ic_launcher_bubbles_pirate_round"

            android:targetActivity=".activities.MainActivity">

            <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

                android:name="android.app.shortcuts"

                android:resource="@xml/compose_shortcuts" />

        </activity-alias>



        <activity-alias

            android:name=".activities.MainActivity.Fediverse"

            android:enabled="false"

app/src/main/ic_launcher_bubbles_pea_green-playstore.png

deleted100644 → 0
−38.1 KiB
Loading image diff...

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

+3 −0
Original line number Diff line number Diff line
@@ -1995,6 +1995,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
        BUBBLES,

        BUBBLESUA,

        BUBBLESPEAGREEN,

        BUBBLESPRIDE,

        BUBBLESPINK,

        BUBBLESPIRATE,

        FEDIVERSE,

        HERO,

        ATOM,

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

+25 −0
Original line number Diff line number Diff line
@@ -60,6 +60,16 @@ public class LogoHelper { 
                return R.drawable.fedilab_logo_crash;

            case "Mastalab":

                return R.drawable.fedilab_logo_mastalab;

            case "BubblesUA":

                return R.drawable.fedilab_logo_bubbles_ua;

            case "BubblesPeaGreen":

                return R.drawable.fedilab_logo_bubbles_pea_green;

            case "BubblesPride":

                return R.drawable.fedilab_logo_bubbles_pride;

            case "BubblesPink":

                return R.drawable.fedilab_logo_bubbles_pink;

            case "BubblesPirate":

                return R.drawable.fedilab_logo_bubbles_pirate;

            default:

                return R.drawable.fedilab_logo_bubbles;

        }
@@ -82,6 +92,12 @@ public class LogoHelper { 
                return R.drawable.fedilab_logo_bubbles_ua;

            case "BubblesPeaGreen":

                return R.drawable.fedilab_logo_bubbles_pea_green;

            case "BubblesPride":

                return R.drawable.fedilab_logo_bubbles_pride;

            case "BubblesPink":

                return R.drawable.fedilab_logo_bubbles_pink;

            case "BubblesPirate":

                return R.drawable.fedilab_logo_bubbles_pirate;

            default:

                return R.drawable.fedilab_logo_bubbles;

        }
@@ -110,6 +126,15 @@ public class LogoHelper { 
            case "BubblesPeaGreen":

                mLauncher = BaseMainActivity.iconLauncher.BUBBLESPEAGREEN;

                break;

            case "BubblesPride":

                mLauncher = BaseMainActivity.iconLauncher.BUBBLESPRIDE;

                break;

            case "BubblesPink":

                mLauncher = BaseMainActivity.iconLauncher.BUBBLESPINK;

                break;

            case "BubblesPirate":

                mLauncher = BaseMainActivity.iconLauncher.BUBBLESPIRATE;

                break;

            default:

                mLauncher = BaseMainActivity.iconLauncher.BUBBLES;

        }

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java

+11 −0
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen 
        context.getPackageManager().setComponentEnabledSetting(

                new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.BubblesPeaGreen"),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);



        context.getPackageManager().setComponentEnabledSetting(

                new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.BubblesPride"),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);



        context.getPackageManager().setComponentEnabledSetting(

                new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.BubblesPink"),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);

        context.getPackageManager().setComponentEnabledSetting(

                new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.BubblesPirate"),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);

    }



    private void setIcon(Context context, String iconName) {