diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index baa308f79..68a2a3531 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,11 +44,11 @@
android:allowBackup="false"
tools:replace="android:allowBackup"
android:usesCleartextTraffic="true"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@mipmap/ic_launcher_bubbles"
android:label="@string/app_name"
android:largeHeap="true"
android:hardwareAccelerated="true"
- android:roundIcon="@mipmap/ic_launcher"
+ android:roundIcon="@mipmap/ic_launcher_bubbles_round"
android:supportsRtl="true"
android:theme="@style/AppThemeDark">
@@ -108,7 +108,6 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/AppThemeDark_NoActionBar">
-
@@ -152,6 +151,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, style);
+ View icon_selector = inflater.inflate(R.layout.dialog_icon_selector, null);
+ dialogBuilder.setView(icon_selector);
+ dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ }
+ });
+ dialogBuilder.setCancelable(true);
+ AlertDialog icon_selector_dialog = dialogBuilder.create();
+ icon_selector_dialog.show();
+
+ icon_selector.findViewById(R.id.icon_bubbles).setOnClickListener(v1 -> {
+ hideAllIcons(context);
+ setIcon(context,"Bubbles");
+ icon_selector_dialog.dismiss();
+ });
+
+ icon_selector.findViewById(R.id.icon_fediverse).setOnClickListener(v1 -> {
+ hideAllIcons(context);
+ setIcon(context,"Fediverse");
+ icon_selector_dialog.dismiss();
+ });
+
+ icon_selector.findViewById(R.id.icon_hero).setOnClickListener(v1 -> {
+ hideAllIcons(context);
+ setIcon(context,"Hero");
+ icon_selector_dialog.dismiss();
+ });
+
+ icon_selector.findViewById(R.id.icon_atom).setOnClickListener(v1 -> {
+ hideAllIcons(context);
+ setIcon(context,"Atom");
+ icon_selector_dialog.dismiss();
+ });
+
+ icon_selector.findViewById(R.id.icon_braincrash).setOnClickListener(v1 -> {
+ hideAllIcons(context);
+ setIcon(context,"BrainCrash");
+ icon_selector_dialog.dismiss();
+ });
+
+ });
+
return rootView;
}
+ private void hideAllIcons(Context context) {
+ context.getPackageManager().setComponentEnabledSetting(
+ new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity.Bubbles"),
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP);
+
+ context.getPackageManager().setComponentEnabledSetting(
+ new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity.Fediverse"),
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP);
+
+ context.getPackageManager().setComponentEnabledSetting(
+ new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity.Hero"),
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP);
+
+ context.getPackageManager().setComponentEnabledSetting(
+ new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity.Atom"),
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP);
+
+ context.getPackageManager().setComponentEnabledSetting(
+ new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity.BrainCrash"),
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP);
+ }
+
+ private void setIcon(Context context, String iconName) {
+ context.getPackageManager().setComponentEnabledSetting(
+ new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity." + iconName),
+ PackageManager.COMPONENT_ENABLED_STATE_ENABLED,PackageManager.DONT_KILL_APP);
+ }
+
@Override
public void onAttach(Context context) {
super.onAttach(context);
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 8d6161bef..079558b3f 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1312,7 +1312,7 @@ public class Helper {
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(context));
Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);
notify_user(context, account, intent, BitmapFactory.decodeResource(context.getResources(),
- R.mipmap.ic_launcher), NotifType.STORE, context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
+ R.mipmap.ic_launcher_bubbles), NotifType.STORE, context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
Toasty.success(context, context.getString(R.string.toast_saved), Toast.LENGTH_LONG).show();
return false;
}
@@ -4393,7 +4393,7 @@ public class Helper {
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(context));
Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);
Helper.notify_user(context, account, intent, BitmapFactory.decodeResource(context.getResources(),
- R.mipmap.ic_launcher), Helper.NotifType.STORE, context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
+ R.mipmap.ic_launcher_bubbles), Helper.NotifType.STORE, context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
}
}
@@ -4598,7 +4598,7 @@ public class Helper {
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(context));
Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);
Helper.notify_user(context, account, intent, BitmapFactory.decodeResource(context.getResources(),
- R.mipmap.ic_launcher), Helper.NotifType.STORE, context.getString(R.string.muted_instance_exported), context.getString(R.string.download_from, backupDBPath));
+ R.mipmap.ic_launcher_bubbles), Helper.NotifType.STORE, context.getString(R.string.muted_instance_exported), context.getString(R.string.download_from, backupDBPath));
}
}.start();
}
diff --git a/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java b/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java
index 6aeac98c9..e253d7e76 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java
@@ -595,7 +595,7 @@ public class Sqlite extends SQLiteOpenHelper {
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(context));
Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);
Helper.notify_user(context, account, intent, BitmapFactory.decodeResource(context.getResources(),
- R.mipmap.ic_launcher), Helper.NotifType.STORE, context.getString(R.string.save_over), context.getString(R.string.download_from, backupDBPath));
+ R.mipmap.ic_launcher_bubbles), Helper.NotifType.STORE, context.getString(R.string.save_over), context.getString(R.string.download_from, backupDBPath));
Toasty.success(context, context.getString(R.string.data_base_exported), Toast.LENGTH_LONG).show();
}
} catch (Exception e) {
diff --git a/app/src/main/res/drawable-v24/ic_launcher_atom_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_atom_foreground.xml
new file mode 100644
index 000000000..c901dbcc5
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_atom_foreground.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+