diff --git a/app/build.gradle b/app/build.gradle index e8a4074..435d5ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "io.virtualapp.sandvxposed" minSdkVersion 19 targetSdkVersion 26 - versionCode 36 - versionName "1.2.5.1.3.1.1.7" + versionCode 37 + versionName "1.2.5.1.3.1.1.8" multiDexEnabled true android { defaultConfig { diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 3aa19bd..0627624 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index de0f0d6..e2ba9de 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":36,"versionName":"1.2.5.1.3.1.1.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":37,"versionName":"1.2.5.1.3.1.1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 83af12d..83b13b5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,13 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme"> - + + = baseLine - mRenameArea.getHeight()) { - // TODO rename app - int deleteAppAreaStartX = location[0]; - if (x < deleteAppAreaStartX) - { - mRenameTextView.setTextColor(Color.parseColor("#0099cc")); - } - else - { - mRenameTextView.setTextColor(Color.WHITE); - } + // TODO: 优化一下位置,要不然那个位置太难被触及了。 + mRenameTextView.setTextColor(Color.parseColor("#0099cc")); + mDeleteAppTextView.setTextColor(Color.WHITE); + mCreateShortcutTextView.setTextColor(Color.WHITE); + upAtRenameArea = true; + upAtCreateShortcutArea = false; + upAtDeleteAppArea = false; } else{ upAtCreateShortcutArea = false; upAtDeleteAppArea = false; + upAtRenameArea = false; mDeleteAppTextView.setTextColor(Color.WHITE); mCreateShortcutTextView.setTextColor(Color.WHITE); mRenameTextView.setTextColor(Color.WHITE); diff --git a/app/src/main/java/io/virtualapp/home/repo/AppRepository.java b/app/src/main/java/io/virtualapp/home/repo/AppRepository.java index d1d76dc..bab9418 100644 --- a/app/src/main/java/io/virtualapp/home/repo/AppRepository.java +++ b/app/src/main/java/io/virtualapp/home/repo/AppRepository.java @@ -4,6 +4,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.util.Log; import com.lody.virtual.GmsSupport; import com.lody.virtual.client.core.InstallStrategy; @@ -26,6 +27,8 @@ import io.virtualapp.home.models.AppInfoLite; import io.virtualapp.home.models.MultiplePackageAppData; import io.virtualapp.home.models.PackageAppData; +import sk.vpkg.manager.RenameAppUtils; +import sk.vpkg.provider.BanNotificationProvider; /** * @author Lody @@ -65,12 +68,27 @@ public Promise, Throwable, Void> getVirtualApps() { } PackageAppData data = new PackageAppData(mContext, info); if (VirtualCore.get().isAppInstalledAsUser(0, info.packageName)) { - models.add(data); + String lpIsSet = RenameAppUtils.getRenamedApp(data.packageName,0); + if(lpIsSet!=null) + { + data.name = lpIsSet; + models.add(data); + } + else + models.add(data); } int[] userIds = info.getInstalledUsers(); for (int userId : userIds) { + data = new PackageAppData(mContext, info); if (userId != 0) { - models.add(new MultiplePackageAppData(data, userId)); + String lpIsSet = RenameAppUtils.getRenamedApp(data.packageName,userId); + if(lpIsSet!=null) + { + data.name = lpIsSet; + models.add(new MultiplePackageAppData(data, userId)); + } + else + models.add(new MultiplePackageAppData(data, userId)); } } } diff --git a/app/src/main/res/layout/activity_rename_app.xml b/app/src/main/res/layout/activity_rename_app.xml new file mode 100644 index 0000000..bf18959 --- /dev/null +++ b/app/src/main/res/layout/activity_rename_app.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/content_rename_app.xml b/app/src/main/res/layout/content_rename_app.xml new file mode 100644 index 0000000..9b5d1b8 --- /dev/null +++ b/app/src/main/res/layout/content_rename_app.xml @@ -0,0 +1,73 @@ + + + + + +