Add feature to exclude appfilter declaration

Author: Kaiserdragon2

app/build.gradle

@@ -9,7 +9,7 @@ android {
         vectorDrawables.generatedDensities = []
         minSdkVersion 23
         targetSdk 35
-        versionName '2.5.8'
+        versionName '2.5.9'
         versionCode 30
     }
 
@@ -51,7 +51,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:1.9.1'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.core:core:1.15.0'
+    implementation 'androidx.core:core:1.16.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'com.github.sarsamurmu:AdaptiveIconBitmap:1.0.2'
 }

app/src/main/java/de/kaiserdragon/iconrequest/SettingActivity.java

@@ -38,6 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ((CheckBox) findViewById(R.id.checkBoxOnly)).setChecked(SettingsHelper.loadDataBool("SettingOnlyNew", this));
         ((CheckBox) findViewById(R.id.checkShortcut)).setChecked(SettingsHelper.loadDataBool("Shortcut", this));
         ((CheckBox) findViewById(R.id.checkActionMain)).setChecked(SettingsHelper.loadDataBool("ActionMain", this));
+        ((CheckBox) findViewById(R.id.exclude_appfilter_line)).setChecked(SettingsHelper.loadDataBool("exclude_appfilter_line", this));
 
 
         //Button setDark = findViewById(R.id.radioDark);
@@ -59,6 +60,8 @@ protected void onCreate(Bundle savedInstanceState) {
         Shortcut.setOnClickListener(view -> start(view, 0));
         CheckBox ActionMain = findViewById(R.id.checkActionMain);
         ActionMain.setOnClickListener(view -> start(view, 0));
+        CheckBox exclude_appfilter_line = findViewById(R.id.exclude_appfilter_line);
+        exclude_appfilter_line.setOnClickListener(view -> start(view, 0));
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -82,6 +85,8 @@ public void start(View view, int update) {
                 SettingsHelper.saveDataBool("Shortcut", ((CheckBox) view).isChecked(), this);
             } else if (view == findViewById(R.id.checkActionMain)) {
                 SettingsHelper.saveDataBool("ActionMain", ((CheckBox) view).isChecked(), this);
+            } else if (view == findViewById(R.id.exclude_appfilter_line)) {
+                SettingsHelper.saveDataBool("exclude_appfilter_line", ((CheckBox) view).isChecked(), this);
             }
         }
 

app/src/main/java/de/kaiserdragon/iconrequest/helper/ShareHelper.java

@@ -2,6 +2,7 @@
 
 import static de.kaiserdragon.iconrequest.BuildConfig.DEBUG;
 import static de.kaiserdragon.iconrequest.helper.CommonHelper.makeToast;
+import static de.kaiserdragon.iconrequest.helper.SettingsHelper.loadDataBool;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -124,6 +125,8 @@ public static String[] actionSave(AppAdapter adapter, Boolean updateOnly, Contex
         ByteArrayOutputStream BaOs = new ByteArrayOutputStream();
         ZipOutputStream zos = new ZipOutputStream(BaOs);
 
+        boolean excludeAppfilterLines = loadDataBool("exclude_appfilter_line",context);
+
         ArrayList<AppInfo> arrayList = adapter.getAllSelected();
         if (arrayList.isEmpty()) {
             // no apps are selected
@@ -135,14 +138,15 @@ public static String[] actionSave(AppAdapter adapter, Boolean updateOnly, Contex
         StringBuilder stringBuilderXML = new StringBuilder();
         stringBuilderEmail.append(context.getString(R.string.request_email_text));
         ArrayList<String> LabelList = new ArrayList<>();
-        stringBuilderXML.append("<appfilter>\n\n");
+        if (!excludeAppfilterLines) stringBuilderXML.append("<appfilter>\n\n");
         // process selected apps
         for (int i = 0; i < arrayList.size(); i++) {
             //if (arrayList.get(i).selected) {
             String iconName = arrayList.get(i).label.replaceAll("[^a-zA-Z0-9 ]+", "").replaceAll("[ ]+", "_").toLowerCase();
             if (DEBUG) Log.i(TAG, "iconName: " + iconName);
             if (!updateOnly) {
                 //if a name is a duplicate rename 1 so nothing gets replaced while saving
+                //check if icon is in an arraylist if not add else rename and check again
                 int n = 0;
                 while (LabelList.contains(iconName)) {
                     n++;
@@ -165,12 +169,12 @@ public static String[] actionSave(AppAdapter adapter, Boolean updateOnly, Contex
 
             }
             if (DEBUG) Log.i(TAG, "iconName: " + iconName);
-            //check if icon is in an arraylist if not add else rename and check again
+            if (i != 0) stringBuilderXML.append("\n\n");
             stringBuilderEmail.append(arrayList.get(i).label).append("\n");
-            stringBuilderXML.append("\t<!-- ").append(arrayList.get(i).label).append(" -->\n\t<item component=\"ComponentInfo{").append(arrayList.get(i).getCode()).append("}\" drawable=\"").append(iconName).append("\"/>").append("\n\n");
-
+            if (!(arrayList.size()<=1 && excludeAppfilterLines)) stringBuilderXML.append("\t<!-- ").append(arrayList.get(i).label).append(" -->\n\t");
+            stringBuilderXML.append("<item component=\"ComponentInfo{").append(arrayList.get(i).getCode()).append("}\" drawable=\"").append(iconName).append("\"/>");
         }
-        stringBuilderXML.append("</appfilter>");
+        if (!excludeAppfilterLines) stringBuilderXML.append("\n\n</appfilter>");
         // }
         SimpleDateFormat date = new SimpleDateFormat("ddMMyyyy_HHmmss", Locale.US);
         String zipName = date.format(new Date());

app/src/main/res/layout/settings.xml

@@ -148,6 +148,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/MainNoLaunch" />
+            <CheckBox
+                android:id="@+id/exclude_appfilter_line"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/excludeAppfilterLines" />
 
         </LinearLayout>
     </ScrollView>

app/src/main/res/values-de-rDE/strings.xml

@@ -41,4 +41,5 @@
     <string name="ShowIconPack">Zeige Icon Pack</string>
     <string name="All">Alle</string>
     <string name="choose2IPack">Wähle zwei Icon Packs</string>
+    <string name="excludeAppfilterLines">Entferne &lt;appfilter&gt; &lt;/appfilter&gt; von appfilter</string>
 </resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -41,4 +41,5 @@
     <string name="ShowIconPack">Show Icon Pack</string>
     <string name="All">All</string>
     <string name="choose2IPack">Choose two icon packs</string>
+    <string name="excludeAppfilterLines">Excludere &lt;appfilter&gt; &lt;/appfilter&gt; di appfilter</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -63,6 +63,7 @@
     <string name="IconPack2" translatable="false">IconPack2</string>
     <string name="All">All</string>
     <string name="choose2IPack">Choose two icon packs</string>
+    <string name="excludeAppfilterLines">Exclude &lt;appfilter&gt; &lt;/appfilter&gt; from appfilter</string>
 
 
 </resources>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.8.2'
+        classpath 'com.android.tools.build:gradle:8.9.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME