diff --git a/app/build.gradle b/app/build.gradle index 17cee8c42415667dcb17c62adf33bf8232c49ed7..13b1fa375c383c0357aeb01c434793f4c305754d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { defaultConfig { minSdk 21 targetSdk 34 - versionCode 525 - versionName "3.31.1" + versionCode 528 + versionName "3.31.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } flavorDimensions "default" @@ -115,7 +115,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.android.material:material:1.10.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2d1497531ecd543922bd73f6974bbdda414793c8..94a24f1b5e85b727b5e61e62fc450f3b02d40018 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,8 +11,6 @@ tools:ignore="ScopedStorage" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json index dfbe9b17a914f0cb157f12043b6118c2c8ad21ff..dbb5859157a847e9de9bb014a71dd44b9e0662f2 100644 --- a/app/src/main/assets/release_notes/notes.json +++ b/app/src/main/assets/release_notes/notes.json @@ -1,8 +1,18 @@ [ + { + "version": "3.31.3", + "code": "528", + "note": "Added:\n- Add new icon launchers (Settings > Interface)\n\nChanged:\n- Make logout/proxy button more visible in main menu\n- Remove permission FOREGROUND_SERVICE\n- Improve a little more media layout with translations\n\nFixed:\n- Fix status bar icons not visible in light theme with custom accent color\n- Reaction buttons not clickable for some instances" + }, + { + "version": "3.31.2", + "code": "527", + "note": "Added:\n- Add support to URL scheme \"web+ap\" for opening profiles with the app\n\nChanged:\n- Layout for media descriptions\n\nFixed:\n- Fix a crash when translating media descriptions\n- Handle included twice when replying to a self user's boost\n- Fix color issues when using a custom theme" + }, { "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" + "code": "526", + "note": "Added:\n- Add MinT machine translation system support\n- Add support \"instance only\" for GoToSocial\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", diff --git a/app/src/main/java/app/fedilab/android/activities/WebActivityPub.java b/app/src/main/java/app/fedilab/android/activities/WebActivityPub.java new file mode 100644 index 0000000000000000000000000000000000000000..9214652ac3c3e2d0f2088eb287f90002bd9c2ecd --- /dev/null +++ b/app/src/main/java/app/fedilab/android/activities/WebActivityPub.java @@ -0,0 +1,102 @@ +package app.fedilab.android.activities; +/* Copyright 2025 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 . */ + +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import app.fedilab.android.mastodon.activities.ProfileActivity; +import app.fedilab.android.mastodon.client.entities.app.CachedBundle; +import app.fedilab.android.mastodon.helper.Helper; + + +public class WebActivityPub extends AppCompatActivity { + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Intent appIntent = getIntent(); + String acct = null; + String intent = null; + if(appIntent == null) { + finish(); + return; + } + Uri uri = appIntent.getData(); + if(uri == null) { + finish(); + return; + } + String scheme = uri.getScheme(); + String uriString = uri.toString(); + if(!uriString.startsWith(scheme+"://")) { + uriString = uri.toString().replace(scheme+":",scheme+"://"); + uri = Uri.parse(uriString); + if(uri == null) { + finish(); + return; + } + } + + String host = uri.getHost(); + String path = uri.getPath(); + String query = uri.getQuery(); + + if(path == null || path.isEmpty()) { + finish(); + return; + } + if(query != null) { + String intentPatternString = "intent=(\\w+)"; + final Pattern intentPattern = Pattern.compile(intentPatternString, Pattern.CASE_INSENSITIVE); + Matcher matcherIntent = intentPattern.matcher(query); + while (matcherIntent.find()) { + intent = matcherIntent.group(1); + } + } + if(path.startsWith("/@")) { + String[] params = path.split("@"); + if(params.length == 2) { + acct = params[1] + "@" + host; + } + } else if(path.split("/").length > 2) { + String[] params = path.split("/"); + String root = params[1].toLowerCase(); + if (root.equals("users")) { + acct = params[2] + "@" + host; + } + } + if(acct != null) { + Intent intentProfile = new Intent(WebActivityPub.this, ProfileActivity.class); + Bundle args = new Bundle(); + args.putString(Helper.ARG_MENTION, acct); + new CachedBundle(WebActivityPub.this).insertBundle(args, Helper.getCurrentAccount(WebActivityPub.this), bundleId -> { + Bundle bundle = new Bundle(); + bundle.putLong(Helper.ARG_INTENT_ID, bundleId); + intentProfile.putExtras(bundle); + intentProfile.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intentProfile); + }); + } + finish(); + } +} diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java index 8507bda9eeb0e66d2910ba4fbf990655ed04a195..7c71a738e4345e97782936488ce15e2ec3d301c9 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java @@ -15,7 +15,9 @@ package app.fedilab.android.mastodon.activities; * see . */ +import static app.fedilab.android.BaseMainActivity.currentInstance; import static app.fedilab.android.BaseMainActivity.currentNightMode; +import static app.fedilab.android.BaseMainActivity.currentUserID; import android.annotation.SuppressLint; import android.content.Context; @@ -24,6 +26,7 @@ import android.content.res.Configuration; import android.graphics.Color; import android.os.Build; import android.os.Bundle; +import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -72,8 +75,20 @@ public class BaseActivity extends AppCompatActivity { } String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME)); + boolean customAccentEnabled = sharedpreferences.getBoolean(getString(R.string.SET_CUSTOM_ACCENT) + currentUserID + currentInstance, false); + //Default automatic switch currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + + + if(customAccentEnabled && currentNightMode == Configuration.UI_MODE_NIGHT_NO) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR|View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); + }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + } + if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) { switch (currentNightMode) { case Configuration.UI_MODE_NIGHT_NO -> { diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java index e606020b44f0d88f2c0b255d20c0b898f866c4f8..94912f041eecc96513c7a9ce40e47fb9932ba166 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java @@ -15,7 +15,9 @@ package app.fedilab.android.mastodon.activities; * see . */ +import static app.fedilab.android.BaseMainActivity.currentInstance; import static app.fedilab.android.BaseMainActivity.currentNightMode; +import static app.fedilab.android.BaseMainActivity.currentUserID; import android.annotation.SuppressLint; import android.content.Context; @@ -24,6 +26,7 @@ import android.content.res.Configuration; import android.graphics.Color; import android.os.Build; import android.os.Bundle; +import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -67,8 +70,16 @@ public class BaseBarActivity extends AppCompatActivity { } } String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME)); + boolean customAccentEnabled = sharedpreferences.getBoolean(getString(R.string.SET_CUSTOM_ACCENT) + currentUserID + currentInstance, false); //Default automatic switch currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + if(customAccentEnabled && currentNightMode == Configuration.UI_MODE_NIGHT_NO) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR|View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); + }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + } if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) { switch (currentNightMode) { case Configuration.UI_MODE_NIGHT_NO -> { diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java index 03d3323812e2f8062692b7b139a6a583d01cf6df..d0e53c863517c72dbd954e6022be322705bf1f65 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java @@ -669,7 +669,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana mention.username = mentionBooster.username; boolean present = false; for (Mention mentionTmp : statusDraftList.get(0).mentions) { - if (mentionTmp.acct.equalsIgnoreCase(mentionBooster.acct)) { + if (mentionTmp.acct.equalsIgnoreCase("@"+mentionBooster.acct)) { present = true; break; } diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java index b5e85f0f9545170cc42f0e986d521966ad1a5b4b..aca57088ca11427f1d3be653d6829e07bfb9a299 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java @@ -73,7 +73,7 @@ import app.fedilab.android.mastodon.ui.fragment.media.FragmentMediaProfile; import es.dmoral.toasty.Toasty; -public class MediaActivity extends BaseTransparentActivity implements OnDownloadInterface { +public class MediaActivity extends BaseBarActivity implements OnDownloadInterface { int flags; private ArrayList attachments; @@ -186,11 +186,11 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload binding.mediaDescription.setMovementMethod(LinkMovementMethod.getInstance()); binding.mediaDescriptionTranslated.setMovementMethod(LinkMovementMethod.getInstance()); - if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) { + if (description != null && !description.trim().isEmpty() && description.trim().compareTo("null") != 0) { binding.mediaDescription.setText(description); binding.translate.setOnClickListener(v -> { String descriptionToTranslate = attachments.get(mediaPosition - 1).description; - TranslateHelper.translate(MediaActivity.this, descriptionToTranslate, status.language, translated -> { + TranslateHelper.translate(MediaActivity.this, descriptionToTranslate, status!=null?status.language:"en", translated -> { if (translated != null) { attachments.get(mediaPosition - 1).translation = translated; binding.mediaDescriptionTranslated.setText(translated); @@ -199,6 +199,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload if (mCurrentFragment != null) { mCurrentFragment.toggleController(false); } + binding.translate.setVisibility(View.GONE); } else { Toasty.error(MediaActivity.this, getString(R.string.toast_error_translate), Toast.LENGTH_LONG).show(); } @@ -234,12 +235,12 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload handler.removeCallbacksAndMessages(null); } handler = new Handler(); - if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) { + if (description != null && !description.trim().isEmpty() && description.trim().compareTo("null") != 0) { binding.mediaDescription.setText(linkify(MediaActivity.this, description), TextView.BufferType.SPANNABLE); } binding.translate.setOnClickListener(v -> { String descriptionToTranslate = attachments.get(position).description; - TranslateHelper.translate(MediaActivity.this, descriptionToTranslate, status.language, translated -> { + TranslateHelper.translate(MediaActivity.this, descriptionToTranslate, status!=null?status.language:"en", translated -> { if (translated != null) { attachments.get(position).translation = translated; binding.mediaDescriptionTranslated.setText(translated); @@ -248,6 +249,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload if (mCurrentFragment != null) { mCurrentFragment.toggleController(true); } + binding.translate.setVisibility(View.GONE); } else { Toasty.error(MediaActivity.this, getString(R.string.toast_error_translate), Toast.LENGTH_LONG).show(); } @@ -495,6 +497,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload this.fullscreen = fullscreen; if (!fullscreen) { showSystemUI(); + binding.descriptionContainer.setVisibility(View.VISIBLE); binding.mediaDescription.setVisibility(View.VISIBLE); if (mCurrentFragment != null) { mCurrentFragment.toggleController(true); @@ -505,6 +508,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload } } else { hideSystemUI(); + binding.descriptionContainer.setVisibility(View.GONE); binding.mediaDescription.setVisibility(View.GONE); if (mCurrentFragment != null) { mCurrentFragment.toggleController(false); diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java index 23d3db65a060c733028dd633cc027879639c3eff..694e600edfbc4a381550b8ef6f62453cc90a40a7 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java @@ -631,15 +631,17 @@ public class StatusAdapter extends RecyclerView.Adapter holder.binding.quotedMessage.cardviewContainer.setVisibility(View.GONE); } - if (Helper.getCurrentAccount(context) != null && Helper.getCurrentAccount(context).api == Account.API.PLEROMA || status.reactions != null) { - if (status.pleroma != null && status.pleroma.emoji_reactions != null && status.pleroma.emoji_reactions.size() > 0) { + if (extraFeatures && displayReactions) { + holder.binding.statusAddCustomEmoji.setVisibility(View.VISIBLE); + holder.binding.statusEmoji.setVisibility(View.VISIBLE); + if (status.pleroma != null && status.pleroma.emoji_reactions != null && !status.pleroma.emoji_reactions.isEmpty()) { holder.binding.layoutReactions.getRoot().setVisibility(View.VISIBLE); ReactionAdapter reactionAdapter = new ReactionAdapter(status.id, status.pleroma.emoji_reactions, true); holder.binding.layoutReactions.reactionsView.setAdapter(reactionAdapter); LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false); holder.binding.layoutReactions.reactionsView.setLayoutManager(layoutManager); - } else if (status.reactions != null && status.reactions.size() > 0) { + } else if (status.reactions != null && !status.reactions.isEmpty()) { holder.binding.layoutReactions.getRoot().setVisibility(View.VISIBLE); ReactionAdapter reactionAdapter = new ReactionAdapter(status.id, status.reactions, true, false); holder.binding.layoutReactions.reactionsView.setAdapter(reactionAdapter); @@ -801,6 +803,9 @@ public class StatusAdapter extends RecyclerView.Adapter } builder.show(); }); + } else { + holder.binding.statusAddCustomEmoji.setVisibility(View.GONE); + holder.binding.statusEmoji.setVisibility(View.GONE); } int truncate_toots_size = sharedpreferences.getInt(context.getString(R.string.SET_TRUNCATE_TOOTS_SIZE), 0); @@ -811,15 +816,6 @@ public class StatusAdapter extends RecyclerView.Adapter } else { holder.binding.actionButtonQuote.setVisibility(View.GONE); } - if (displayReactions) { - holder.binding.statusAddCustomEmoji.setVisibility(View.VISIBLE); - holder.binding.statusEmoji.setVisibility(View.VISIBLE); - } else { - holder.binding.statusAddCustomEmoji.setVisibility(View.GONE); - holder.binding.statusEmoji.setVisibility(View.GONE); - } - - } if (status.isMaths == null) { diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java index 3019cccba1d9d24cc628c92370cbbe446bda3ff7..92132e1096116dc4a7aa276a39f9223c3601a395 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java @@ -120,7 +120,6 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen ListPreference SET_LOGO_LAUNCHER = findPreference(getString(R.string.SET_LOGO_LAUNCHER)); String newLauncher = sharedpreferences.getString(getString(R.string.SET_LOGO_LAUNCHER), "Bubbles"); if (Character.isUpperCase(newLauncher.codePointAt(0))) { - hideAllIcons(requireActivity()); setIcon(requireActivity(), newLauncher); SET_LOGO_LAUNCHER.setIcon(LogoHelper.getDrawable(newLauncher)); setDrawable(newLauncher); @@ -134,57 +133,19 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen } } - private void hideAllIcons(Context context) { - - - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.Bubbles"), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.Fediverse"), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.Hero"), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.Atom"), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.BrainCrash"), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.Mastalab"), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity.BubblesUA"), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - - 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) { - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity." + iconName), - PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); + private void setIcon(Context context, String theChosenIcon) { + String[] logoTypeValues = getResources().getStringArray(R.array.SET_LOGO_TYPE_VALUE); + for (String logoTypeValue : logoTypeValues) { + if (logoTypeValue.equals(theChosenIcon)) { + context.getPackageManager().setComponentEnabledSetting( + new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity." + logoTypeValue), + PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); + } else { + context.getPackageManager().setComponentEnabledSetting( + new ComponentName(BuildConfig.APPLICATION_ID, "app.fedilab.android.activities.MainActivity." + logoTypeValue), + PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); + } + } } @Override diff --git a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java index af0905d32415bb361b3e245ba2233ddcec702bcd..3e0fdf634aa7e3e00c8d83d120f0af88df80cd26 100644 --- a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java +++ b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java @@ -512,9 +512,9 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity { } private void startInForeground() { - Intent notificationIntent = new Intent(this, RetrieveInfoService.class); + Intent retrieveInfoServiceIntent = new Intent(this, RetrieveInfoService.class); try { - startService(notificationIntent); + startService(retrieveInfoServiceIntent); } catch (Exception ignored) { } } diff --git a/app/src/main/java/app/fedilab/android/peertube/services/RetrieveInfoService.java b/app/src/main/java/app/fedilab/android/peertube/services/RetrieveInfoService.java index d4274e0c838435baeef7109991d60c5550e3e79f..a49837624654dc6025aa1a55f1407b54c6ded899 100644 --- a/app/src/main/java/app/fedilab/android/peertube/services/RetrieveInfoService.java +++ b/app/src/main/java/app/fedilab/android/peertube/services/RetrieveInfoService.java @@ -16,28 +16,19 @@ package app.fedilab.android.peertube.services; import static app.fedilab.android.peertube.helper.Helper.peertubeInformation; -import android.app.Notification; -import android.app.NotificationChannel; -import android.app.NotificationManager; import android.app.Service; -import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.ServiceInfo; import android.net.ConnectivityManager; -import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; import androidx.annotation.Nullable; -import androidx.core.app.NotificationCompat; import androidx.core.content.ContextCompat; import java.util.LinkedHashMap; -import java.util.Objects; -import app.fedilab.android.R; import app.fedilab.android.peertube.client.RetrofitPeertubeAPI; import app.fedilab.android.peertube.client.entities.PeertubeInformation; import app.fedilab.android.peertube.helper.EmojiHelper; @@ -46,7 +37,6 @@ import app.fedilab.android.peertube.helper.NetworkStateReceiver; public class RetrieveInfoService extends Service implements NetworkStateReceiver.NetworkStateReceiverListener { - static String NOTIFICATION_CHANNEL_ID = "update_info_peertube"; private NetworkStateReceiver networkStateReceiver; @@ -55,36 +45,6 @@ public class RetrieveInfoService extends Service implements NetworkStateReceiver networkStateReceiver = new NetworkStateReceiver(); networkStateReceiver.addListener(this); ContextCompat.registerReceiver(RetrieveInfoService.this, networkStateReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, - getString(R.string.notification_channel_name), - NotificationManager.IMPORTANCE_DEFAULT); - channel.setSound(null, null); - - ((NotificationManager) Objects.requireNonNull(getSystemService(Context.NOTIFICATION_SERVICE))).createNotificationChannel(channel); - Notification notification = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) - .setSmallIcon(R.drawable.ic_notification) - .setContentTitle(getString(R.string.app_name)) - .setContentText(getString(R.string.notification_channel_name)) - .setAutoCancel(true).build(); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - startForeground(1, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC); - } else { - startForeground(1, notification); - } - - } else { - NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) - .setContentTitle(getString(R.string.app_name)) - .setDefaults(Notification.DEFAULT_ALL) - .setContentText(getString(R.string.notification_channel_name)) - .setPriority(NotificationCompat.PRIORITY_DEFAULT) - .setAutoCancel(true); - - Notification notification = builder.build(); - startForeground(1, notification); - } } @@ -140,7 +100,7 @@ public class RetrieveInfoService extends Service implements NetworkStateReceiver @Override public void run() { EmojiHelper.fillMapEmoji(getApplicationContext()); - if (peertubeInformation == null || peertubeInformation.getCategories() == null || peertubeInformation.getCategories().size() == 0) { + if (peertubeInformation == null || peertubeInformation.getCategories() == null || peertubeInformation.getCategories().isEmpty()) { peertubeInformation = new PeertubeInformation(); peertubeInformation.setCategories(new LinkedHashMap<>()); peertubeInformation.setLanguages(new LinkedHashMap<>()); @@ -150,7 +110,6 @@ public class RetrieveInfoService extends Service implements NetworkStateReceiver peertubeInformation.setTranslations(new LinkedHashMap<>()); peertubeInformation = new RetrofitPeertubeAPI(RetrieveInfoService.this).getPeertubeInformation(); } - stopForeground(true); } }; thread.start(); diff --git a/app/src/main/res/drawable-anydpi-v24/ic_launcher_purple_1_foreground.xml b/app/src/main/res/drawable-anydpi-v24/ic_launcher_purple_1_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..56fcabf9810ccd24872a13bdfe296155746ab2d8 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_launcher_purple_1_foreground.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v24/ic_launcher_warm_foreground.xml b/app/src/main/res/drawable-anydpi-v24/ic_launcher_warm_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..7dcb40bcd3723e9ffa91731a754fc725394f74f7 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_launcher_warm_foreground.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_confetti_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_confetti_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..18d75aa1a7b1f3dc2a837d76f392a5f3238bffb7 --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_confetti_foreground.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_jungle_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_jungle_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..e2d096d7cae2cfe0b7adffe560215cf6a86a6cee --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_jungle_foreground.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_leaf_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_leaf_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..a7638ff7674a1f700345bcd8cd2c1a5ee4f642db --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_leaf_foreground.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_mosaic_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_mosaic_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..a506ce2f2e1eb7da69a0344d51a4cf1e3a39d051 --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_mosaic_foreground.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_offset_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_offset_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..8597b3f854ea5f1b3681cdb8f693846604cbcb3c --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_offset_foreground.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_purple_2_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_purple_2_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..0b7e26b8fba73c66f1cabe16d9cd050411ff0ce5 --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_purple_2_foreground.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_spaghetti_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_spaghetti_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..9d774e1d315ab0b3300f0da1ab02e3c08084f177 --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_spaghetti_foreground.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/ic_launcher_yellow_headed_red_bubble_foreground.xml b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_yellow_headed_red_bubble_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..c49567bf0dac087415ea377cf04f8e9203fe012f --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/ic_launcher_yellow_headed_red_bubble_foreground.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml b/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml index b5e2dcb967006b144b6330671afeda5983f1b690..2b541a9d93e58ae9ee7f0d562eab84f22a736eba 100644 --- a/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml +++ b/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml @@ -20,8 +20,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true" + android:fitsSystemWindows="true" android:background="@android:color/transparent"> + - - - + android:layout_width="match_parent" + android:layout_height="wrap_content"> + - + tools:visibility="visible" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layouts/mastodon/layout/nav_header_main.xml b/app/src/main/res/layouts/mastodon/layout/nav_header_main.xml index 96a787284b730667cbe7621707133c91dcadcea0..61b6daaeaf8c15300982c81a2dce8f0cae973115 100644 --- a/app/src/main/res/layouts/mastodon/layout/nav_header_main.xml +++ b/app/src/main/res/layouts/mastodon/layout/nav_header_main.xml @@ -13,18 +13,20 @@ android:minHeight="@dimen/nav_header_height" android:scaleType="centerCrop" tools:src="@tools:sample/backgrounds/scenic" /> - - + app:icon="@drawable/ic_baseline_more_vert_24" /> + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_confetti_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_confetti_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..4e0ad6d83096269df789f3f8e959743a96ad54cb --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_confetti_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_jungle.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_jungle.xml new file mode 100644 index 0000000000000000000000000000000000000000..30df00b66a1b436f9870c909f47dd89353f13921 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_jungle.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_jungle_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_jungle_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..30df00b66a1b436f9870c909f47dd89353f13921 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_jungle_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_leaf.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_leaf.xml new file mode 100644 index 0000000000000000000000000000000000000000..cf2dd48875b04cbc50a1f78c838d6902da6b8416 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_leaf.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_leaf_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_leaf_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..cf2dd48875b04cbc50a1f78c838d6902da6b8416 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_leaf_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mosaic.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mosaic.xml new file mode 100644 index 0000000000000000000000000000000000000000..4ddba42bc5ff800edb184e20298b72e7097f896f --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mosaic.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mosaic_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mosaic_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..4ddba42bc5ff800edb184e20298b72e7097f896f --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mosaic_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_offset.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_offset.xml new file mode 100644 index 0000000000000000000000000000000000000000..fd0c91dc1ca98eb086ca6f18c3555d99cf4405af --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_offset.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_offset_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_offset_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..fd0c91dc1ca98eb086ca6f18c3555d99cf4405af --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_offset_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_1.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..207aa2f02eb92ae97712249d8597e5efb41318d3 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_1.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_1_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_1_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..207aa2f02eb92ae97712249d8597e5efb41318d3 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_1_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_2.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..c48d25bf091e6e6c74becc9b148d8af23c398533 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_2.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_2_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_2_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..c48d25bf091e6e6c74becc9b148d8af23c398533 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_2_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_spaghetti.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_spaghetti.xml new file mode 100644 index 0000000000000000000000000000000000000000..eaefb9d6c3b78f8ac5509406c1863058df488cba --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_spaghetti.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_spaghetti_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_spaghetti_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..eaefb9d6c3b78f8ac5509406c1863058df488cba --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_spaghetti_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_warm.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_warm.xml new file mode 100644 index 0000000000000000000000000000000000000000..4364dc1410f84960d816a842d3171d732551db10 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_warm.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_warm_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_warm_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..4364dc1410f84960d816a842d3171d732551db10 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_warm_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_headed_red_bubble.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_headed_red_bubble.xml new file mode 100644 index 0000000000000000000000000000000000000000..bfc3cbe02248b55edb3cd52530dadc99a49c5411 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_headed_red_bubble.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_headed_red_bubble_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_headed_red_bubble_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..bfc3cbe02248b55edb3cd52530dadc99a49c5411 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow_headed_red_bubble_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_confetti.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_confetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..30b4094b5810830ff314fedc6d45f1224078a7c7 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_confetti.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_confetti_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_confetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..d41c2beb7e52bd3f9032d8ae39109e30fe56273d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_confetti_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_jungle.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_jungle.webp new file mode 100644 index 0000000000000000000000000000000000000000..ef2848cc4756c449de3596904fed46bbb3ac7069 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_jungle.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_jungle_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_jungle_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..67e2761e8bdd15a54e018f77273230acb5f682ee Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_jungle_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_leaf.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_leaf.webp new file mode 100644 index 0000000000000000000000000000000000000000..3ad4596e21981d4022965f0c6325bdac090ee6e7 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_leaf.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_leaf_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_leaf_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b1fcfa4453e42d13daad60da8b3275268c28269a Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_leaf_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_mosaic.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_mosaic.webp new file mode 100644 index 0000000000000000000000000000000000000000..4507c5af8790fabbac212c6735788fc8e494b4ce Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_mosaic.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_mosaic_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_mosaic_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..d090e63250236dfc97a2709629be5d690b33345a Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_mosaic_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_offset.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_offset.webp new file mode 100644 index 0000000000000000000000000000000000000000..785333e733fb6952d92d1630b65a5ab624fa5318 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_offset.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_offset_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_offset_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..fbf43682cc62fb4ec5821570f29fe78fcada9181 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_offset_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_1.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_1.webp new file mode 100644 index 0000000000000000000000000000000000000000..58d9c84db10e495b216730b5ce8c033f1e512878 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_1.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_1_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_1_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..c36479a352a18d82c946c2d02843058ef8d2b2f2 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_1_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_2.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_2.webp new file mode 100644 index 0000000000000000000000000000000000000000..6a5c8fa70f42a0fa9343888695537efaf4ee89d7 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_2.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_2_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_2_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..4539f01172ad3f1b82fd7f814c563d6df6e33bce Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_2_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_spaghetti.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_spaghetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..0ceb98418ffe73203f70c14aa052ca8ca43fc7f5 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_spaghetti.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_spaghetti_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_spaghetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..7b5d5fd9156d362eb17c516bbff03cffdc9c657b Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_spaghetti_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_warm.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_warm.webp new file mode 100644 index 0000000000000000000000000000000000000000..517acf24c2796f1f895385aa9ca59f2ef14870c1 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_warm.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_warm_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_warm_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..8977bcbaf39d4f472150d4c8037e3824074a5c8c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_warm_round.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_headed_red_bubble.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_headed_red_bubble.webp new file mode 100644 index 0000000000000000000000000000000000000000..f2805a30c4c81f7f5874da863ded2c46fe9e540e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_headed_red_bubble.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_headed_red_bubble_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_headed_red_bubble_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..715574b3e7c3ae083746162a3c1b1d2aa539d8ab Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow_headed_red_bubble_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_confetti.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_confetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..7c0f940b3e3f3b32746fb6df8435a174125dba0f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_confetti.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_confetti_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_confetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..f9f4a9b4caabeb5132c39eca5403ee9bd7a2e81e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_confetti_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_jungle.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_jungle.webp new file mode 100644 index 0000000000000000000000000000000000000000..a3bdb06ebacd0675d651ede46be6fb0de8b8497a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_jungle.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_jungle_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_jungle_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..87c1d102e07d7f317fa3296ac9524b7cfdcf88eb Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_jungle_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_leaf.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_leaf.webp new file mode 100644 index 0000000000000000000000000000000000000000..ca218351f6bb81ef21ddc5c8da76afd5f3614702 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_leaf.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_leaf_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_leaf_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..982337f73896bf95a2badeaef92c51ceef493b74 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_leaf_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_mosaic.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_mosaic.webp new file mode 100644 index 0000000000000000000000000000000000000000..dcd16e2eae5a2f01907ccd264a9a2bd6589634c4 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_mosaic.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_mosaic_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_mosaic_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1d839df04b571a4676fa9d9bb8848c64e7ba61f6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_mosaic_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_offset.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_offset.webp new file mode 100644 index 0000000000000000000000000000000000000000..4d0ca688b70465b4536cab49ea9d53d0b304b6c1 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_offset.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_offset_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_offset_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..ede9d168436dfb2514977a76bc800cb9dad34666 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_offset_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_1.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_1.webp new file mode 100644 index 0000000000000000000000000000000000000000..628d48a0634fcfe929dee6303b1f87ab22f4ca43 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_1.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_1_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_1_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..2bf5454ab1bdf089b66a941e3e4acf7ea5d11b73 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_1_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_2.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_2.webp new file mode 100644 index 0000000000000000000000000000000000000000..f8bd89514368a6d5834ceafa8d72a4ef35ef2e46 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_2.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_2_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_2_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..3635ecfd5051a600ecda918b92f5de1c166519a6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_2_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_spaghetti.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_spaghetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..8da912e5dce40c01c35812724093b8c9bc3a351d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_spaghetti.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_spaghetti_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_spaghetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..e0266fcb3089fbdda8804df0ace42459d82deaf9 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_spaghetti_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_warm.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_warm.webp new file mode 100644 index 0000000000000000000000000000000000000000..be3b006663a12cda99ea5a8917665330c20938dd Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_warm.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_warm_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_warm_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..085abb8ddc55fe6d3862290c314640867eb1b83b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_warm_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_headed_red_bubble.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_headed_red_bubble.webp new file mode 100644 index 0000000000000000000000000000000000000000..66e420332dee9891966e43a3b0d975e6639cc0b0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_headed_red_bubble.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_headed_red_bubble_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_headed_red_bubble_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..ffafe41aebdb2193bec1d0c4c47681f96a6dd5de Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow_headed_red_bubble_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_confetti.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_confetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..a6fc2e11abaf94e41a716fbe3cb137e26ada10bb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_confetti.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_confetti_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_confetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..f570fbbbd348ab26c77517181620f49c20d586fd Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_confetti_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_jungle.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_jungle.webp new file mode 100644 index 0000000000000000000000000000000000000000..d6cc9b8d56160bcc82312d92eb8fcce5fe6580df Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_jungle.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_jungle_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_jungle_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..17e1f94f747d934a044c50407124276a39ec63b8 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_jungle_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_leaf.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_leaf.webp new file mode 100644 index 0000000000000000000000000000000000000000..d55426ca1debad77a1426eff844ce94aeb4128cb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_leaf.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_leaf_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_leaf_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..fa384b3bf841b462b975f48eafeb26889f60a637 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_leaf_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_mosaic.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_mosaic.webp new file mode 100644 index 0000000000000000000000000000000000000000..3d70bde8dc6f120413f632e6d4da30f12a10e844 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_mosaic.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_mosaic_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_mosaic_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..d8be880fed6fb76bffe400c43ae39374b69b8e20 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_mosaic_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_offset.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_offset.webp new file mode 100644 index 0000000000000000000000000000000000000000..948767857c823f0360f5b4d37a555c26e0eca30b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_offset.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_offset_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_offset_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..d2afc599a4aca361f4d439d5095c98597a636db3 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_offset_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_1.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_1.webp new file mode 100644 index 0000000000000000000000000000000000000000..b7256f6fbab6d91decb195bf97fab37a6c5c8109 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_1.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_1_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_1_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..814a35435db7ddbf72f21165b7bc00b4db19d6d4 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_1_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_2.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_2.webp new file mode 100644 index 0000000000000000000000000000000000000000..460f69350a8db065eb7e69b9c81507d887535686 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_2.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_2_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_2_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..2e93b5cea95b7ea9986be1016bdaaee2a880746a Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_2_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_spaghetti.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_spaghetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..a4806433aac1e2cd155b06f6005538f3bd1b6491 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_spaghetti.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_spaghetti_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_spaghetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..099e56984d3d9e864f8fa5867b9d45b07d56f273 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_spaghetti_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_warm.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_warm.webp new file mode 100644 index 0000000000000000000000000000000000000000..f1f55f663b3773ae117f05f311c0da1877462b55 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_warm.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_warm_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_warm_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9075410f24f53be04155449ec720a655bad472e5 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_warm_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_headed_red_bubble.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_headed_red_bubble.webp new file mode 100644 index 0000000000000000000000000000000000000000..c539dce10f99f52dacf600c45d3407019b9e613c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_headed_red_bubble.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_headed_red_bubble_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_headed_red_bubble_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..66dcaab48364b5666b42e5cfcdd00cf365dc0103 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow_headed_red_bubble_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_confetti.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_confetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..6488b9067c994b45014b50b430babc0831c36878 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_confetti.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_confetti_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_confetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..494871798bd8c8891876d2a050ad48f78727eca9 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_confetti_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_jungle.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_jungle.webp new file mode 100644 index 0000000000000000000000000000000000000000..e7207a483b975ffa9cfec1d362e0ce6944b5ea1a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_jungle.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_jungle_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_jungle_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..32eff82b2c76f3e3b89f5d4ce19f820cb7a98689 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_jungle_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_leaf.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_leaf.webp new file mode 100644 index 0000000000000000000000000000000000000000..86b6f433dbea52cd39390af1a3a4c1b29ab1825a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_leaf.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_leaf_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_leaf_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..2fc02ab96e70db5d1064abef08d639eef31d464a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_leaf_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosaic.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosaic.webp new file mode 100644 index 0000000000000000000000000000000000000000..68623c3ee4094ae0907d803b587cb4e12681547c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosaic.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosaic_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosaic_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..791a094798ea397c9c52598c544add877c1a64e1 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosaic_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_offset.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_offset.webp new file mode 100644 index 0000000000000000000000000000000000000000..607288bdb44090945be2097f49b334d1bba7c542 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_offset.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_offset_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_offset_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..a41c79bec156d6a286a6ffe47ac43ebf67235cff Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_offset_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_1.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_1.webp new file mode 100644 index 0000000000000000000000000000000000000000..61acf439bf2ed911375f032a12b52d1c85d91596 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_1.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_1_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_1_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..e3add432b4e1160ab7379c1dee0eda2ee6831994 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_1_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_2.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_2.webp new file mode 100644 index 0000000000000000000000000000000000000000..d6e71b394c98356cc08f35353b9979c204effd62 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_2.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_2_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_2_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..720da3b27ed2f06f733dfb33e5a1b1fc80e2ee1b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_2_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_spaghetti.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_spaghetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..69d5cb1a5047a566ad9fa4169b20766343c05f4d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_spaghetti.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_spaghetti_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_spaghetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..c8d5cbce8d98879f94dead15a350d3ac9e47c244 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_spaghetti_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_warm.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_warm.webp new file mode 100644 index 0000000000000000000000000000000000000000..2cf8735b431c90eacc5067b20fd796d9660dd119 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_warm.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_warm_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_warm_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..f1dd68aab15fd0428a5f2aaee65a4242c76fff17 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_warm_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_headed_red_bubble.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_headed_red_bubble.webp new file mode 100644 index 0000000000000000000000000000000000000000..6e1ad49ed156915c6c175fa3fae731c436d14374 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_headed_red_bubble.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_headed_red_bubble_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_headed_red_bubble_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..a7d411800ae603fb7dd402e8832cc5b0cae5a208 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow_headed_red_bubble_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_confetti.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_confetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..32e83c8c0e50e1f78178ed82c145886ee198b0f1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_confetti.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_confetti_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_confetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..2b9e71075ede9b8e8866f5f74216f0ffc582698a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_confetti_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_jungle.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_jungle.webp new file mode 100644 index 0000000000000000000000000000000000000000..f633b252e761e9f11613bd5840410d1c0606fe6d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_jungle.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_jungle_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_jungle_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..f31246bc529e775fd9e2ef4e217becb25f55268b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_jungle_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_leaf.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_leaf.webp new file mode 100644 index 0000000000000000000000000000000000000000..474144d2375aa5f3b19572bcfbfed985612d8707 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_leaf.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_leaf_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_leaf_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..d070143a15911d0ec098f9f6d86a2816708edfde Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_leaf_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosaic.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosaic.webp new file mode 100644 index 0000000000000000000000000000000000000000..b43582a329efde4da9154b2c488584f288cd7dae Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosaic.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosaic_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosaic_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..c732c7c1fbb868b74121c85b2bf50c5e2c85d271 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosaic_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_offset.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_offset.webp new file mode 100644 index 0000000000000000000000000000000000000000..cc2d45e861d25a0104f201db1ca7e9c129c1e761 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_offset.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_offset_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_offset_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..e3e912458b64f75246a06d2acd1137116491b277 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_offset_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_1.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_1.webp new file mode 100644 index 0000000000000000000000000000000000000000..35e5c113e095f1963377262f241162986296e12d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_1.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_1_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_1_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..fbbfb228e803cfe72a163220ac5e98f3c5a82500 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_1_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_2.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_2.webp new file mode 100644 index 0000000000000000000000000000000000000000..106005f5d263f45a29ca1b9d93bc9e45b93c7663 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_2.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_2_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_2_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..cc13b28719f5d2e2f34c607bf42a029877031db4 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_2_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_spaghetti.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_spaghetti.webp new file mode 100644 index 0000000000000000000000000000000000000000..477562383a1a8201f90effc89d10949dea4f047c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_spaghetti.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_spaghetti_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_spaghetti_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..f726acb113c48889846bb4953dad8c3b89f9b8e8 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_spaghetti_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_warm.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_warm.webp new file mode 100644 index 0000000000000000000000000000000000000000..2bf61260e3d22da5231f58c2d26e1403d4189437 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_warm.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_warm_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_warm_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..87b052c891ed665d43d134168a420b72f7243d75 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_warm_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_headed_red_bubble.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_headed_red_bubble.webp new file mode 100644 index 0000000000000000000000000000000000000000..63ab4d89885278dd8c56fc052c6e23a31d9bb7a7 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_headed_red_bubble.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_headed_red_bubble_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_headed_red_bubble_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1f1b971f5300b74685012bd533c9262444139f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow_headed_red_bubble_round.webp differ diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 589ad9dfc4000b824cd2b4d4e53fc95c6d9828de..5ba700a273c4d4811b340dc59d54baee29653aff 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1089,4 +1089,11 @@ Podpora zájmen Generátor QR kódů Není k dispozici internetové připojení! + Aplikaci se nepovedlo ověřit účet! + Token nemůže být prázdný! + Použít token + Váš token + Média přes celý displej + Média se budou zobrazovat přes celou šířku displeje a u výšky se bude respektovat poměr stran. + Tagy Twitteru (přes Nitter) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 750a881d505b55bea23a0017b521209688ea127f..d1117c3c1477077306bcefe849ce341077359e9f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -561,7 +561,7 @@ Ouvrir avec une autre application Vérifier la redirection Cette URL ne redirige pas - %1$s\n\nredirige vers\n\n%2$s + %1$s \n\nredirige vers\n\n %2$s Supprimer les paramètres UTM L’application supprimera automatiquement les paramètres UTM des URL avant de visiter un lien. %d personnes en parlent @@ -664,7 +664,7 @@ \n %s utilisateur·ice·s - %s statuts Vérifié à : %s Temps en ligne : %,.2f %% - Afficher le contenu > + ]]> Arrêter l\'enregistrement Signalement de %1$s Dites-nous ce qui ne va pas avec cette publication @@ -696,7 +696,7 @@ Toujours afficher le bouton marque-page Elle viole les règles du serveur Afficher - Masquer le contenu < + "Également préféré par : " Également partagé par : Menu de la barre supérieure @@ -958,11 +958,11 @@ Format de publication Présentation façon Pixelfed pour les médias Afficher le bouton « Citer » - Afficher les boutons \"Réactions\". + Afficher les boutons \"Réactions\" Format du message Exclure la visibilité Profils distants - Afficher le bouton \"Local uniquement\". + Afficher le bouton \"Local uniquement\" Local uniquement Suivi·e par : Nouveau @@ -1027,7 +1027,7 @@ %d messages récupérés Les boutons en bas des messages n’occuperont pas toute la largeur Récupération des messages - Récupérer le compte distant ! + Récupération du compte distant ! Rédiger L\'étiquette a été supprimée ! L\'étiquette a été enregistrée ! @@ -1079,4 +1079,11 @@ Image de la carte Afficher la date relative des messages Prise en charge des pronoms + Tags Twitter (via Nitter) + Votre jeton + Le jeton ne peut être vide ! + Utiliser un jeton + L\'application n\'a réussi à authentifier le compte ! + Pas de connexion internet ! + Médias en plein écran diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 8344bd2c06dffdc8f941ef7c8152d6eb26a462d0..0afe1d32b5db4ea044bc22c3a05e8d31f285332b 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -26,6 +26,7 @@ @color/md_theme_dark_background @color/md_theme_dark_onBackground @color/md_theme_dark_surface + @color/md_theme_dark_surface @color/md_theme_dark_onSurface @color/md_theme_dark_surfaceVariant @color/md_theme_dark_onSurfaceVariant @@ -72,6 +73,7 @@ @color/md_theme_dark_background @color/md_theme_dark_onBackground @color/md_theme_dark_surface + @color/md_theme_dark_surface @color/md_theme_dark_onSurface @color/md_theme_dark_surfaceVariant @color/md_theme_dark_onSurfaceVariant @@ -126,6 +128,7 @@ @color/md_theme_dark_background @color/md_theme_dark_onBackground @color/md_theme_dark_surface + @color/md_theme_dark_surface @color/md_theme_dark_onSurface @color/md_theme_dark_surfaceVariant @color/md_theme_dark_onSurfaceVariant @@ -164,6 +167,7 @@ @color/solarized_md_theme_dark_background @color/solarized_md_theme_dark_onBackground @color/solarized_md_theme_dark_surface + @color/solarized_md_theme_dark_surface @color/solarized_md_theme_dark_onSurface @color/solarized_md_theme_dark_surfaceVariant @color/solarized_md_theme_dark_onSurfaceVariant @@ -200,6 +204,7 @@ @color/solarized_md_theme_dark_background @color/solarized_md_theme_dark_onBackground @color/solarized_md_theme_dark_surface + @color/solarized_md_theme_dark_surface @color/solarized_md_theme_dark_onSurface @color/solarized_md_theme_dark_surfaceVariant @color/solarized_md_theme_dark_onSurfaceVariant @@ -255,6 +260,7 @@ @color/solarized_md_theme_dark_background @color/solarized_md_theme_dark_onBackground @color/solarized_md_theme_dark_surface + @color/solarized_md_theme_dark_surface @color/solarized_md_theme_dark_onSurface @color/solarized_md_theme_dark_surfaceVariant @color/solarized_md_theme_dark_onSurfaceVariant @@ -288,6 +294,7 @@ @color/black @color/white @color/black + @color/black @color/white @color/black @color/white @@ -320,6 +327,7 @@ @color/black @color/white @color/black + @color/black @color/white @color/black @color/white @@ -370,6 +378,7 @@ @color/black @color/white @color/black + @color/black @color/white @color/black @color/white @@ -404,6 +413,7 @@ @color/dracula_background @color/dracula_foreground @color/dracula_background + @color/dracula_background @color/dracula_foreground @color/dracula_current_Line @color/dracula_foreground @@ -437,6 +447,7 @@ @color/dracula_background @color/dracula_foreground @color/dracula_background + @color/dracula_background @color/dracula_foreground @color/dracula_current_Line @color/dracula_foreground @@ -488,6 +499,7 @@ @color/dracula_background @color/dracula_foreground @color/dracula_background + @color/dracula_background @color/dracula_foreground @color/dracula_current_Line @color/dracula_foreground diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 3f990d342972c417510d79bd46a2ee92a802e526..1e584e8a8d906fbdc7a96318545df86e570a7d63 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -592,7 +592,7 @@ \n %s utentes - %s istados Imprea un\'interfache alternativa pro Instagram Domìniu de s\'interfache pro Instagram - Cua su cuntenutu > + Nara·nos ite no andat bene cun custa publicatzione Issèbera sa mègius currispondèntzia Ligàmenes malos, interatzione farsa o rispostas ripetitivas @@ -626,7 +626,7 @@ No est in lìnia! Verificadu: %s Tempus in lìnia: %,.2f %% - Ammustra su cuntenutu > + ]]> Firma sa registratzione Sinnalende %1$s No est una cosa chi boles bìdere @@ -1075,4 +1075,12 @@ Ùrtimas 24 oras %d frecuèntzia (minutos) S\'aplicatzione at a ammustrare is arresonadas in manera pùblica pro retzire totu is messàgios. Is interatziones ant a bisongiare de unu passu in prus pro federare is messàgios. + Imprea unu getone + Su getone tuo + Non ddoe est peruna connessione a ìnternet! + Su getone non podet èssere bòidu! + Sos elementos multimediales s\'ant a pigare totu sa largària de ischermu e sos raportos de sas dimensiones pro s\'artària s\'at a rispetare. + Mèdios a ischermu intreu + Etichetas de Twitter (tràmite Nitter) + S\'aplicatzione no est resèssida a autenticare su contu! diff --git a/app/src/main/res/values/ic_launcher_confetti_background.xml b/app/src/main/res/values/ic_launcher_confetti_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..a30075affa2faa7271a8683e4f2e0053d6d3090f --- /dev/null +++ b/app/src/main/res/values/ic_launcher_confetti_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_jungle_background.xml b/app/src/main/res/values/ic_launcher_jungle_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..01f9e245715739c0662f654678fb6a3cc7592636 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_jungle_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_leaf_background.xml b/app/src/main/res/values/ic_launcher_leaf_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..50937dd273663d0f78e0337f69f13c10e62b21bf --- /dev/null +++ b/app/src/main/res/values/ic_launcher_leaf_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_mosaic_background.xml b/app/src/main/res/values/ic_launcher_mosaic_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..f7cdc016858667347d8707e7a31b67ff0a920df3 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_mosaic_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_offset_background.xml b/app/src/main/res/values/ic_launcher_offset_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..11d97384405a0b27a63520a4c4b808da3966824e --- /dev/null +++ b/app/src/main/res/values/ic_launcher_offset_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_purple_1_background.xml b/app/src/main/res/values/ic_launcher_purple_1_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..30811b94bebf408eec19c38ca888731cae6e9b77 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_purple_1_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_purple_2_background.xml b/app/src/main/res/values/ic_launcher_purple_2_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..47a964dca979d279ce04d4d22f0e06f50701f03c --- /dev/null +++ b/app/src/main/res/values/ic_launcher_purple_2_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_spaghetti_background.xml b/app/src/main/res/values/ic_launcher_spaghetti_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..1b5a8d22f89ee5d8e59ba344d49af3bab494f45e --- /dev/null +++ b/app/src/main/res/values/ic_launcher_spaghetti_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_warm_background.xml b/app/src/main/res/values/ic_launcher_warm_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..70422e0eb327c73029f58bd78d22b22d9d8474a6 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_warm_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_yellow_headed_red_bubble_background.xml b/app/src/main/res/values/ic_launcher_yellow_headed_red_bubble_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..dfbeb44df59fda4c5c7bc24ab0b558a76c626e85 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_yellow_headed_red_bubble_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 15ee76306cd05d7d92fe1e63776bb1baab0c9a7b..36f21d294b70166071b925456a356e4ccceeb5a4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -795,6 +795,16 @@ Atom BrainCrash Mastalab + Leaf + Offset + Jungle + Confetti + Spaghetti + Warm + Purple_1 + Purple_2 + Yellow-Headed Red Bubble + Mosaic Bubbles @@ -808,6 +818,16 @@ Atom BrainCrash Mastalab + Leaf + Offset + Jungle + Confetti + Spaghetti + Warm + Purple1 + Purple2 + YellowHeadedRedBubble + Mosaic @@ -822,6 +842,16 @@ @drawable/ic_launcher_atom_foreground @drawable/ic_launcher_crash_foreground @drawable/ic_launcher_mastalab_foreground + @drawable/ic_launcher_leaf_foreground + @drawable/ic_launcher_offset_foreground + @drawable/ic_launcher_jungle_foreground + @drawable/ic_launcher_confetti_foreground + @drawable/ic_launcher_spaghetti_foreground + @drawable/ic_launcher_warm_foreground + @drawable/ic_launcher_purple_1_foreground + @drawable/ic_launcher_purple_2_foreground + @drawable/ic_launcher_yellow_headed_red_bubble_foreground + @drawable/ic_launcher_mosaic_foreground diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/525.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/526.txt similarity index 83% rename from src/fdroid/fastlane/metadata/android/en/changelogs/525.txt rename to src/fdroid/fastlane/metadata/android/en/changelogs/526.txt index 457a43d36ec2dcbcb00a2c091cf7c7030fae25ac..0d749e3b63124fa9e668732fa8ddd860c693ac81 100644 --- a/src/fdroid/fastlane/metadata/android/en/changelogs/525.txt +++ b/src/fdroid/fastlane/metadata/android/en/changelogs/526.txt @@ -1,5 +1,6 @@ Added: - Add MinT machine translation system support +- Add support "instance only" for GoToSocial Fixed: - GIF not displayed in timelines diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/527.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/527.txt new file mode 100644 index 0000000000000000000000000000000000000000..a8fe6ad2c1cc3b1e5785a07968ec137453d5374d --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/en/changelogs/527.txt @@ -0,0 +1,10 @@ +Added: +- Add support to URL scheme "web+ap" for opening profiles with the app + +Changed: +- Layout for media descriptions + +Fixed: +- Fix a crash when translating media descriptions +- Handle included twice when replying to a self user's boost +- Fix color issues when using a custom theme \ No newline at end of file diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/528.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/528.txt new file mode 100644 index 0000000000000000000000000000000000000000..6d9ec6592326ac284aac41146d25c64e310815fa --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/en/changelogs/528.txt @@ -0,0 +1,11 @@ +Added: +- Add new icon launchers (Settings > Interface) + +Changed: +- Make logout/proxy button more visible in main menu +- Remove permission FOREGROUND_SERVICE +- Improve a little more media layout with translations + +Fixed: +- Fix status bar icons not visible in light theme with custom accent color +- Reaction buttons not clickable for some instances diff --git a/src/fdroid/fastlane/metadata/android/uk/changelogs/525.txt b/src/fdroid/fastlane/metadata/android/uk/changelogs/526.txt similarity index 60% rename from src/fdroid/fastlane/metadata/android/uk/changelogs/525.txt rename to src/fdroid/fastlane/metadata/android/uk/changelogs/526.txt index f76b728aaa85249d6408839ef8f5d49acb1ba9b4..477b70454cd4691238c84cacfc31f006f33e1f2b 100644 --- a/src/fdroid/fastlane/metadata/android/uk/changelogs/525.txt +++ b/src/fdroid/fastlane/metadata/android/uk/changelogs/526.txt @@ -1,8 +1,9 @@ Додано: - Додано підтримку системи машинного перекладу MinT +- Додано підтримку "лише екземплярів" для GoToSocial Виправлено: - GIF не відображався на часових шкалах -- Виправлено збій під час відкріплення часових шкал -- Забарвлення верхнього рядка при прокручуванні для розмов +- Виправлено збій під час відкріплення шкали часу +- Забарвлення верхньої панелі під час прокрутки для розмов - Чорний екран при поверненні з розділу Peertube diff --git a/src/fdroid/fastlane/metadata/android/uk/changelogs/527.txt b/src/fdroid/fastlane/metadata/android/uk/changelogs/527.txt new file mode 100644 index 0000000000000000000000000000000000000000..5c86179129ee62372816cb433ee0aca5df6b84db --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/uk/changelogs/527.txt @@ -0,0 +1,10 @@ +Додано: +- Додано підтримку схеми URL "web+ap" для відкриття профілів у додатку + +Змінено: +- Макет для описів медіа + +Виправлено: +- Виправлено збій під час перекладу описів медіа +- Двічі включено дескриптор під час відповіді на заохочення користувача +- Виправлено проблеми з кольором під час використання кастомної теми diff --git a/src/fdroid/fastlane/metadata/android/uk/changelogs/528.txt b/src/fdroid/fastlane/metadata/android/uk/changelogs/528.txt new file mode 100644 index 0000000000000000000000000000000000000000..41b8835ff0d0fd1126c11f7645b7e520c9a71cff --- /dev/null +++ b/src/fdroid/fastlane/metadata/android/uk/changelogs/528.txt @@ -0,0 +1,11 @@ +Додано: +- Додано нові іконки запуску (Налаштування > Інтерфейс) + +Змінено: +- Зроблено кнопку виходу/проксі більш помітною в головному меню +- Видалено дозвіл FOREGROUND_SERVICE +- Трохи покращено макет медіа з перекладами + +Виправлено: +- Виправлено іконки рядка стану, які не видно у світлій темі зі спеціальним кольором акценту +- Кнопки реакції не натискалися в деяких випадках