Merge pull request #14 from Kaiserdragon2/Rewrite

Rewrite
Kaiserdragon2 · Dec 23, 2022 · 2c795fd · 2c795fd
2 parents 30c0334 + f9e1992
commit 2c795fd
Show file tree

Hide file tree

Showing 23 changed files with 560 additions and 1,320 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId 'de.kaiserdragon.iconrequest'
         minSdkVersion 21
         targetSdkVersion 31
-        versionName "1.9.6"
-        versionCode 14
+        versionName "2.0.0"
+        versionCode 15
     }
 
     buildTypes {
@@ -36,6 +36,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+    namespace 'de.kaiserdragon.iconrequest'
 }
 
 dependencies {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="de.kaiserdragon.iconrequest">
-
+    xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
         <intent>
@@ -23,14 +21,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="de.kaiserdragon.iconrequest.MainActivity" />
         </activity>
-        <activity
-            android:name="de.kaiserdragon.iconrequest.CompareIPacks"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.kaiserdragon.iconrequest.MainActivity" />
-        </activity>
         <activity
             android:name="de.kaiserdragon.iconrequest.SettingActivity"
             android:label="@string/app_name"
@@ -53,9 +43,7 @@
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true"
-            android:readPermission="true">
+            android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />

diff --git a/app/src/main/java/de/kaiserdragon/iconrequest/AppInfo.java b/app/src/main/java/de/kaiserdragon/iconrequest/AppInfo.java
@@ -10,7 +10,7 @@ public class AppInfo {
     String packageName;
     String className;
 
-    AppInfo(Drawable icon, Drawable icon2, String label, String packageName, String className, boolean selected) {
+    public AppInfo(Drawable icon, Drawable icon2, String label, String packageName, String className, boolean selected) {
         this.icon = icon;
         this.icon2 = icon2;
         this.label = label;
@@ -23,6 +23,34 @@ public String getCode() {
         return packageName + "/" + className;
     }
 
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public Drawable getIcon() {
+        return icon;
+    }
+
+    public void setIcon(Drawable icon) {
+        this.icon = icon;
+    }
+
+    public Drawable getIcon2() {
+        return icon2;
+    }
+
+    public boolean isSelected() {
+        return selected;
+    }
+
+    public void setSelected(boolean selected) {
+        this.selected = selected;
+    }
+
     @Override
     public boolean equals(Object object) {
         if (object instanceof AppInfo) {