diff --git a/APKToolGUI/APKToolGUI.csproj b/APKToolGUI/APKToolGUI.csproj index 0d68b3e..5592cc5 100644 --- a/APKToolGUI/APKToolGUI.csproj +++ b/APKToolGUI/APKToolGUI.csproj @@ -282,6 +282,7 @@ Component + @@ -381,18 +382,10 @@ - - - - - - - - diff --git a/APKToolGUI/ApkTool/AaptParser.cs b/APKToolGUI/ApkTool/AaptParser.cs index b67cd79..fa217d2 100644 --- a/APKToolGUI/ApkTool/AaptParser.cs +++ b/APKToolGUI/ApkTool/AaptParser.cs @@ -12,6 +12,12 @@ namespace APKToolGUI.Utils { public string ApkFile; + public string RealApkFile; + + public string Armv7ApkFile; + + public string Arm64ApkFile; + public string AppName; public string PackageName; @@ -20,7 +26,11 @@ namespace APKToolGUI.Utils public string VersionCode; - public string SdkVersion; + public string MinSdkVersionDetailed; + + public string TargetSdkVersionDetailed; + + public string MinSdkVersion; public string TargetSdkVersion; @@ -34,6 +44,8 @@ namespace APKToolGUI.Utils public string Densities; + public string NativeCode; + public string PlayStoreLink; public string ApkComboLink; @@ -42,7 +54,17 @@ namespace APKToolGUI.Utils public string ApkAioLink; - public string AppIcon = null; + public string ApkGkLink; + + public string ApkSupportLink; + + public string ApkSosLink; + + public string ApkMirrorLink; + + public string ApkDlLink; + + public string AppIcon; public string FullInfo; @@ -74,10 +96,12 @@ namespace APKToolGUI.Utils Permissions += StringExt.Regex(@"(?<=name=\')(.*?)(?=\')", line) + "\n"; break; case "sdkVersion": - SdkVersion = SdkToAndroidVer(StringExt.Regex(@"(?<=sdkVersion:\')(.*?)(?=\')", line)); + MinSdkVersionDetailed = SdkToAndroidVer(StringExt.Regex(@"(?<=sdkVersion:\')(.*?)(?=\')", line)); + MinSdkVersion = StringExt.Regex(@"(?<=sdkVersion:\')(.*?)(?=\')", line); break; case "targetSdkVersion": - TargetSdkVersion = SdkToAndroidVer(StringExt.Regex(@"(?<=targetSdkVersion:\')(.*?)(?=\')", line)); + TargetSdkVersionDetailed = SdkToAndroidVer(StringExt.Regex(@"(?<=targetSdkVersion:\')(.*?)(?=\')", line)); + TargetSdkVersion = StringExt.Regex(@"(?<=targetSdkVersion:\')(.*?)(?=\')", line); break; case "application-label": AppName = StringExt.Regex(@"(?<=application-label:\')(.*?)(?=\')", line); @@ -100,6 +124,10 @@ namespace APKToolGUI.Utils var densities = Regex.Matches(line.Split(':')[1], @"(?<= \')(.*?)(?=\')").Cast().Select(m => m.Value).ToList(); Densities = string.Join(", ", densities); break; + case "native-code": + var nativecode = Regex.Matches(line.Split(':')[1], @"(?<= \')(.*?)(?=\')").Cast().Select(m => m.Value).ToList(); + NativeCode = string.Join(", ", nativecode); + break; } } @@ -164,14 +192,18 @@ namespace APKToolGUI.Utils { switch (sdk) { + case "33": + return "31: Android 13"; + case "32": + return "31: Android 12.0L"; case "31": - return "31: Android 12.0"; + return "31: Android 12"; case "30": - return "30: Android 11.0"; + return "30: Android 11"; case "29": - return "29: Android 10.0"; + return "29: Android 10"; case "28": - return "28: Android 9.0 (Pie)"; + return "28: Android 9 (Pie)"; case "27": return "27: Android 8.1 (Oreo MR1)"; case "26": @@ -181,7 +213,7 @@ namespace APKToolGUI.Utils case "24": return "24: Android 7.0 (Nougat)"; case "23": - return "23: Android 6.0 (Marshmallow)"; + return "23: Android 6 (Marshmallow)"; case "22": return "22: Android 5.1 (Lollipop MR1)"; case "21": diff --git a/APKToolGUI/Forms/FormMain.Designer.cs b/APKToolGUI/Forms/FormMain.Designer.cs index 8451fc3..f1087dd 100644 --- a/APKToolGUI/Forms/FormMain.Designer.cs +++ b/APKToolGUI/Forms/FormMain.Designer.cs @@ -229,6 +229,13 @@ this.menuItemCheckUpdate = new System.Windows.Forms.MenuItem(); this.apktoolIssueItem = new System.Windows.Forms.MenuItem(); this.menuItemAbout = new System.Windows.Forms.MenuItem(); + this.apkGkLinkBtn = new System.Windows.Forms.Button(); + this.apkSupportLinkBtn = new System.Windows.Forms.Button(); + this.apkMirrorLinkBtn = new System.Windows.Forms.Button(); + this.apkSosLinkBtn = new System.Windows.Forms.Button(); + this.apkDlLinkBtn = new System.Windows.Forms.Button(); + this.label30 = new System.Windows.Forms.Label(); + this.archSdkTxtBox = new System.Windows.Forms.TextBox(); this.tabControlMain.SuspendLayout(); this.tabPageMain.SuspendLayout(); this.signPanel.SuspendLayout(); @@ -520,6 +527,13 @@ // this.basicInfoTabPage.AllowDrop = true; resources.ApplyResources(this.basicInfoTabPage, "basicInfoTabPage"); + this.basicInfoTabPage.Controls.Add(this.archSdkTxtBox); + this.basicInfoTabPage.Controls.Add(this.label30); + this.basicInfoTabPage.Controls.Add(this.apkDlLinkBtn); + this.basicInfoTabPage.Controls.Add(this.apkSosLinkBtn); + this.basicInfoTabPage.Controls.Add(this.apkMirrorLinkBtn); + this.basicInfoTabPage.Controls.Add(this.apkSupportLinkBtn); + this.basicInfoTabPage.Controls.Add(this.apkGkLinkBtn); this.basicInfoTabPage.Controls.Add(this.label17); this.basicInfoTabPage.Controls.Add(this.localsTxtBox); this.basicInfoTabPage.Controls.Add(this.selApkFileInfoBtn); @@ -568,7 +582,6 @@ resources.ApplyResources(this.selApkFileInfoBtn, "selApkFileInfoBtn"); this.selApkFileInfoBtn.Name = "selApkFileInfoBtn"; this.selApkFileInfoBtn.UseVisualStyleBackColor = true; - this.selApkFileInfoBtn.Click += new System.EventHandler(this.selApkFileInfoBtn_Click); // // label18 // @@ -592,7 +605,6 @@ resources.ApplyResources(this.apkComboLinkBtn, "apkComboLinkBtn"); this.apkComboLinkBtn.Name = "apkComboLinkBtn"; this.apkComboLinkBtn.UseVisualStyleBackColor = true; - this.apkComboLinkBtn.Click += new System.EventHandler(this.apkComboLinkBtn_Click); // // label15 // @@ -621,7 +633,6 @@ resources.ApplyResources(this.apkAioLinkBtn, "apkAioLinkBtn"); this.apkAioLinkBtn.Name = "apkAioLinkBtn"; this.apkAioLinkBtn.UseVisualStyleBackColor = true; - this.apkAioLinkBtn.Click += new System.EventHandler(this.apkAioLinkBtn_Click); // // packNameTxtBox // @@ -634,7 +645,6 @@ resources.ApplyResources(this.apkPureLinkBtn, "apkPureLinkBtn"); this.apkPureLinkBtn.Name = "apkPureLinkBtn"; this.apkPureLinkBtn.UseVisualStyleBackColor = true; - this.apkPureLinkBtn.Click += new System.EventHandler(this.apkPureLinkBtn_Click); // // verTxtBox // @@ -647,7 +657,6 @@ resources.ApplyResources(this.psLinkBtn, "psLinkBtn"); this.psLinkBtn.Name = "psLinkBtn"; this.psLinkBtn.UseVisualStyleBackColor = true; - this.psLinkBtn.Click += new System.EventHandler(this.psLinkBtn_Click); // // minSdkTxtBox // @@ -1725,7 +1734,7 @@ this.logGridView.ReadOnly = true; this.logGridView.RowHeadersVisible = false; this.logGridView.RowTemplate.DefaultCellStyle.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.logGridView.RowTemplate.Height = 15; + this.logGridView.RowTemplate.Height = 10; this.logGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.logGridView.ShowEditingIcon = false; // @@ -1829,6 +1838,47 @@ resources.ApplyResources(this.menuItemAbout, "menuItemAbout"); this.menuItemAbout.Click += new System.EventHandler(this.menuItemAbout_Click); // + // apkGkLinkBtn + // + resources.ApplyResources(this.apkGkLinkBtn, "apkGkLinkBtn"); + this.apkGkLinkBtn.Name = "apkGkLinkBtn"; + this.apkGkLinkBtn.UseVisualStyleBackColor = true; + // + // apkSupportLinkBtn + // + resources.ApplyResources(this.apkSupportLinkBtn, "apkSupportLinkBtn"); + this.apkSupportLinkBtn.Name = "apkSupportLinkBtn"; + this.apkSupportLinkBtn.UseVisualStyleBackColor = true; + // + // apkMirrorLinkBtn + // + resources.ApplyResources(this.apkMirrorLinkBtn, "apkMirrorLinkBtn"); + this.apkMirrorLinkBtn.Name = "apkMirrorLinkBtn"; + this.apkMirrorLinkBtn.UseVisualStyleBackColor = true; + // + // apkSosLinkBtn + // + resources.ApplyResources(this.apkSosLinkBtn, "apkSosLinkBtn"); + this.apkSosLinkBtn.Name = "apkSosLinkBtn"; + this.apkSosLinkBtn.UseVisualStyleBackColor = true; + // + // apkDlLinkBtn + // + resources.ApplyResources(this.apkDlLinkBtn, "apkDlLinkBtn"); + this.apkDlLinkBtn.Name = "apkDlLinkBtn"; + this.apkDlLinkBtn.UseVisualStyleBackColor = true; + // + // label30 + // + resources.ApplyResources(this.label30, "label30"); + this.label30.Name = "label30"; + // + // archSdkTxtBox + // + resources.ApplyResources(this.archSdkTxtBox, "archSdkTxtBox"); + this.archSdkTxtBox.Name = "archSdkTxtBox"; + this.archSdkTxtBox.ReadOnly = true; + // // FormMain // this.AllowDrop = true; @@ -2094,6 +2144,13 @@ private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.RichTextBox fullInfoTextBox; internal System.Windows.Forms.TabPage basicInfoTabPage; + internal System.Windows.Forms.Button apkMirrorLinkBtn; + internal System.Windows.Forms.Button apkDlLinkBtn; + internal System.Windows.Forms.Button apkSosLinkBtn; + internal System.Windows.Forms.Button apkSupportLinkBtn; + internal System.Windows.Forms.Button apkGkLinkBtn; + internal System.Windows.Forms.TextBox archSdkTxtBox; + internal System.Windows.Forms.Label label30; } } diff --git a/APKToolGUI/Forms/FormMain.cs b/APKToolGUI/Forms/FormMain.cs index 1ba49d8..a8ed11f 100644 --- a/APKToolGUI/Forms/FormMain.cs +++ b/APKToolGUI/Forms/FormMain.cs @@ -54,11 +54,6 @@ namespace APKToolGUI if (!File.Exists(Settings.Default.Sign_PublicKey) || String.IsNullOrEmpty(Settings.Default.Sign_PublicKey)) Settings.Default.Sign_PublicKey = Program.SIGNAPK_KEYPUBLIC; - psLinkBtn.Image = new Bitmap(Resources.playstore, new Size(psLinkBtn.Height - 7, psLinkBtn.Height - 7)); - apkComboLinkBtn.Image = new Bitmap(Resources.apkcombo, new Size(apkComboLinkBtn.Height - 7, apkComboLinkBtn.Height - 7)); - apkPureLinkBtn.Image = new Bitmap(Resources.apkpure, new Size(apkPureLinkBtn.Height - 7, apkPureLinkBtn.Height - 7)); - apkAioLinkBtn.Image = new Bitmap(Resources.apkaio, new Size(apkAioLinkBtn.Height - 7, apkAioLinkBtn.Height - 7)); - int v1 = (schemev1ComboBox.Items.Count + 1 > Settings.Default.Sign_Schemev1) ? Settings.Default.Sign_Schemev1 : 0; schemev1ComboBox.SelectedIndex = v1; Settings.Default.Sign_Schemev1 = v1; @@ -83,6 +78,7 @@ namespace APKToolGUI new BaksmaliControlEventHandlers(this); new SmaliControlEventHandlers(this); new DragDropHandlers(this); + new ApkinfoControlEventHandlers(this); stopwatch = new Stopwatch(); } @@ -230,39 +226,43 @@ namespace APKToolGUI { try { + bool result = false; await Task.Factory.StartNew(() => { aapt = new AaptParser(); + result = aapt.Parse(file); - if (aapt.Parse(file)) - { - Invoke(new Action(delegate () - { - if (apkIconPicBox.Image != null) - { - apkIconPicBox.Image.Dispose(); - apkIconPicBox.Image = null; - } - fileTxtBox.Text = aapt.ApkFile; - appTxtBox.Text = aapt.AppName; - packNameTxtBox.Text = aapt.PackageName; - verTxtBox.Text = aapt.VersionName; - buildTxtBox.Text = aapt.VersionCode; - minSdkTxtBox.Text = aapt.SdkVersion; - targetSdkTxtBox.Text = aapt.TargetSdkVersion; - screenTxtBox.Text = aapt.Screens; - densityTxtBox.Text = aapt.Densities; - permTxtBox.Text = aapt.Permissions; - localsTxtBox.Text = aapt.Locales; - fullInfoTextBox.Text = aapt.FullInfo; - ZipUtils.ExtractFile(file, aapt.AppIcon, Path.Combine(Program.TEMP_DIR, aapt.PackageName)); - - string icon = Path.Combine(Program.TEMP_DIR, aapt.PackageName, Path.GetFileName(aapt.AppIcon)); - if (File.Exists(icon)) - apkIconPicBox.Image = Image.FromFile(icon); - })); - } }); + + if (aapt.Parse(file)) + { + if (apkIconPicBox.Image != null) + { + apkIconPicBox.Image.Dispose(); + apkIconPicBox.Image = null; + } + fileTxtBox.Text = aapt.ApkFile; + appTxtBox.Text = aapt.AppName; + packNameTxtBox.Text = aapt.PackageName; + verTxtBox.Text = aapt.VersionName; + buildTxtBox.Text = aapt.VersionCode; + minSdkTxtBox.Text = aapt.MinSdkVersionDetailed; + targetSdkTxtBox.Text = aapt.TargetSdkVersionDetailed; + screenTxtBox.Text = aapt.Screens; + densityTxtBox.Text = aapt.Densities; + permTxtBox.Text = aapt.Permissions; + localsTxtBox.Text = aapt.Locales; + fullInfoTextBox.Text = aapt.FullInfo; + archSdkTxtBox.Text = aapt.NativeCode; + + if (aapt.AppIcon != null) + { + ZipUtils.ExtractFile(file, aapt.AppIcon, Path.Combine(Program.TEMP_DIR, aapt.PackageName)); + string icon = Path.Combine(Program.TEMP_DIR, aapt.PackageName, Path.GetFileName(aapt.AppIcon)); + if (File.Exists(icon)) + apkIconPicBox.Image = Image.FromFile(icon); + } + } } catch (Exception ex) { @@ -274,41 +274,6 @@ namespace APKToolGUI } } } - - private void selApkFileInfoBtn_Click(object sender, EventArgs e) - { - using (OpenFileDialog ofd = new OpenFileDialog()) - { - if (ofd.ShowDialog() == DialogResult.OK) - { - GetApkInfo(ofd.FileName); - } - } - } - - private void psLinkBtn_Click(object sender, EventArgs e) - { - if (aapt != null) - Process.Start(aapt.PlayStoreLink); - } - - private void apkComboLinkBtn_Click(object sender, EventArgs e) - { - if (aapt != null) - Process.Start(aapt.ApkComboLink); - } - - private void apkPureLinkBtn_Click(object sender, EventArgs e) - { - if (aapt != null) - Process.Start(aapt.ApkPureLink); - } - - private void apkAioLinkBtn_Click(object sender, EventArgs e) - { - if (aapt != null) - Process.Start(aapt.ApkAioLink); - } #endregion #region Update checker @@ -358,20 +323,47 @@ namespace APKToolGUI internal void ToLog(string time, string message, Image statusImage, Color backColor) { Size size = new Size(); - size.Width = 20; - size.Height = 20; - if (logGridView.InvokeRequired) - logGridView.BeginInvoke(new Action(() => + size.Width = 15; + size.Height = 15; + + if (message.Contains(Environment.NewLine)) + { + string[] lines = message.Split( + new string[] { Environment.NewLine }, + StringSplitOptions.None + ); + foreach (string line in lines) + { + if (logGridView.InvokeRequired) + logGridView.BeginInvoke(new Action(() => + { + int i = logGridView.Rows.Add(new Bitmap(statusImage, size), time, line); + logGridView.Rows[i].DefaultCellStyle.BackColor = backColor; + logGridView.FirstDisplayedScrollingRowIndex = i; + })); + else + { + int i = logGridView.Rows.Add(new Bitmap(statusImage, size), time, line); + logGridView.Rows[i].DefaultCellStyle.BackColor = backColor; + logGridView.FirstDisplayedScrollingRowIndex = i; + } + } + } + else + { + if (logGridView.InvokeRequired) + logGridView.BeginInvoke(new Action(() => + { + int i = logGridView.Rows.Add(new Bitmap(statusImage, size), time, message); + logGridView.Rows[i].DefaultCellStyle.BackColor = backColor; + logGridView.FirstDisplayedScrollingRowIndex = i; + })); + else { int i = logGridView.Rows.Add(new Bitmap(statusImage, size), time, message); logGridView.Rows[i].DefaultCellStyle.BackColor = backColor; logGridView.FirstDisplayedScrollingRowIndex = i; - })); - else - { - int i = logGridView.Rows.Add(new Bitmap(statusImage, size), time, message); - logGridView.Rows[i].DefaultCellStyle.BackColor = backColor; - logGridView.FirstDisplayedScrollingRowIndex = i; + } } } diff --git a/APKToolGUI/Forms/FormMain.resx b/APKToolGUI/Forms/FormMain.resx index 508a1a1..687dfac 100644 --- a/APKToolGUI/Forms/FormMain.resx +++ b/APKToolGUI/Forms/FormMain.resx @@ -993,6 +993,192 @@ True + + 376, 225 + + + 174, 22 + + + 17 + + + archSdkTxtBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + basicInfoTabPage + + + 0 + + + True + + + NoControl + + + 293, 228 + + + 77, 13 + + + 16 + + + Architectures: + + + label30 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + basicInfoTabPage + + + 1 + + + NoControl + + + 420, 141 + + + 130, 23 + + + 15 + + + Apk-DL + + + apkDlLinkBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + basicInfoTabPage + + + 2 + + + NoControl + + + 420, 115 + + + 130, 23 + + + 14 + + + ApkSos + + + apkSosLinkBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + basicInfoTabPage + + + 3 + + + MiddleLeft + + + NoControl + + + 114, 141 + + + 130, 23 + + + 13 + + + Apk Mirror + + + apkMirrorLinkBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + basicInfoTabPage + + + 4 + + + NoControl + + + 267, 115 + + + 130, 23 + + + 12 + + + Apk.support + + + apkSupportLinkBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + basicInfoTabPage + + + 5 + + + 113, 115 + + + 130, 23 + + + 12 + + + ApkGk + + + apkGkLinkBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + basicInfoTabPage + + + 6 + True @@ -1021,10 +1207,10 @@ basicInfoTabPage - 0 + 7 - 113, 320 + 113, 373 437, 88 @@ -1045,7 +1231,7 @@ basicInfoTabPage - 1 + 8 NoControl @@ -1072,7 +1258,7 @@ basicInfoTabPage - 2 + 9 True @@ -1081,7 +1267,7 @@ NoControl - 6, 322 + 6, 375 44, 13 @@ -1102,7 +1288,7 @@ basicInfoTabPage - 3 + 10 113, 34 @@ -1123,10 +1309,10 @@ basicInfoTabPage - 4 + 11 - 113, 226 + 113, 279 437, 88 @@ -1147,7 +1333,7 @@ basicInfoTabPage - 5 + 12 MiddleLeft @@ -1156,10 +1342,10 @@ NoControl - 225, 88 + 267, 89 - 100, 23 + 130, 23 10 @@ -1177,7 +1363,7 @@ basicInfoTabPage - 6 + 13 True @@ -1186,7 +1372,7 @@ NoControl - 6, 228 + 6, 281 73, 13 @@ -1207,7 +1393,7 @@ basicInfoTabPage - 7 + 14 113, 7 @@ -1228,7 +1414,7 @@ basicInfoTabPage - 8 + 15 True @@ -1237,7 +1423,7 @@ NoControl - 6, 202 + 6, 255 60, 13 @@ -1258,10 +1444,10 @@ basicInfoTabPage - 9 + 16 - 113, 198 + 113, 251 437, 22 @@ -1279,7 +1465,7 @@ basicInfoTabPage - 10 + 17 MiddleLeft @@ -1288,10 +1474,10 @@ NoControl - 450, 88 + 267, 141 - 100, 23 + 130, 23 10 @@ -1309,7 +1495,7 @@ basicInfoTabPage - 11 + 18 113, 62 @@ -1330,7 +1516,7 @@ basicInfoTabPage - 12 + 19 MiddleLeft @@ -1339,10 +1525,10 @@ NoControl - 338, 88 + 420, 89 - 100, 23 + 130, 23 10 @@ -1360,10 +1546,10 @@ basicInfoTabPage - 13 + 20 - 113, 116 + 113, 169 170, 22 @@ -1381,7 +1567,7 @@ basicInfoTabPage - 14 + 21 MiddleLeft @@ -1390,10 +1576,10 @@ NoControl - 113, 88 + 114, 89 - 100, 23 + 130, 23 10 @@ -1411,10 +1597,10 @@ basicInfoTabPage - 15 + 22 - 113, 143 + 113, 196 170, 22 @@ -1432,7 +1618,7 @@ basicInfoTabPage - 16 + 23 True @@ -1462,10 +1648,10 @@ basicInfoTabPage - 17 + 24 - 376, 144 + 376, 197 174, 22 @@ -1483,13 +1669,13 @@ basicInfoTabPage - 18 + 25 - 113, 171 + 113, 224 - 437, 22 + 170, 22 0 @@ -1504,7 +1690,7 @@ basicInfoTabPage - 19 + 26 True @@ -1534,7 +1720,7 @@ basicInfoTabPage - 20 + 27 True @@ -1564,10 +1750,10 @@ basicInfoTabPage - 21 + 28 - 376, 116 + 376, 169 174, 22 @@ -1585,7 +1771,7 @@ basicInfoTabPage - 22 + 29 True @@ -1594,7 +1780,7 @@ NoControl - 6, 120 + 6, 173 48, 13 @@ -1615,7 +1801,7 @@ basicInfoTabPage - 23 + 30 NoControl @@ -1642,7 +1828,7 @@ basicInfoTabPage - 24 + 31 True @@ -1651,7 +1837,7 @@ NoControl - 6, 147 + 6, 200 53, 13 @@ -1672,7 +1858,7 @@ basicInfoTabPage - 25 + 32 True @@ -1681,7 +1867,7 @@ NoControl - 334, 119 + 334, 172 36, 13 @@ -1702,7 +1888,7 @@ basicInfoTabPage - 26 + 33 True @@ -1711,7 +1897,7 @@ NoControl - 6, 175 + 6, 228 74, 13 @@ -1732,7 +1918,7 @@ basicInfoTabPage - 27 + 34 True @@ -1741,7 +1927,7 @@ NoControl - 305, 148 + 305, 201 65, 13 @@ -1762,7 +1948,7 @@ basicInfoTabPage - 28 + 35 4, 22 diff --git a/APKToolGUI/Handlers/ApkinfoControlEventHandlers.cs b/APKToolGUI/Handlers/ApkinfoControlEventHandlers.cs new file mode 100644 index 0000000..137573a --- /dev/null +++ b/APKToolGUI/Handlers/ApkinfoControlEventHandlers.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace APKToolGUI.Handlers +{ + internal class ApkinfoControlEventHandlers + { + private static FormMain main; + public ApkinfoControlEventHandlers(FormMain Main) + { + main = Main; + main.selApkFileInfoBtn.Click += selApkFileInfoBtn_Click; + main.psLinkBtn.Click += psLinkBtn_Click; + main.apkComboLinkBtn.Click += apkComboLinkBtn_Click; + main.apkPureLinkBtn.Click += apkPureLinkBtn_Click; + main.apkGkLinkBtn.Click += apkGkLinkBtn_Click; + main.apkSupportLinkBtn.Click += apkSupportLinkBtn_Click; + main.apkSosLinkBtn.Click += apkSosLinkBtn_Click; + main.apkMirrorLinkBtn.Click += apkMirrorLinkBtn_Click; + main.apkAioLinkBtn.Click += apkAioLinkBtn_Click; + main.apkDlLinkBtn.Click += apkDlLinkBtn_Click; + } + + private void selApkFileInfoBtn_Click(object sender, EventArgs e) + { + using (OpenFileDialog ofd = new OpenFileDialog()) + { + if (ofd.ShowDialog() == DialogResult.OK) + { + main.GetApkInfo(ofd.FileName); + } + } + } + + private void psLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.PlayStoreLink); + } + + private void apkComboLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkComboLink); + } + + private void apkPureLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkPureLink); + } + + private void apkGkLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkGkLink); + } + + private void apkSupportLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkSupportLink); + } + + private void apkSosLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkSosLink); + } + + private void apkMirrorLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkMirrorLink); + } + + private void apkAioLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkAioLink); + } + + private void apkDlLinkBtn_Click(object sender, EventArgs e) + { + if (main.aapt != null) + Process.Start(main.aapt.ApkDlLink); + } + } +} diff --git a/APKToolGUI/Properties/Resources.Designer.cs b/APKToolGUI/Properties/Resources.Designer.cs index 798a443..a7965e5 100644 --- a/APKToolGUI/Properties/Resources.Designer.cs +++ b/APKToolGUI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace APKToolGUI.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -80,36 +80,6 @@ namespace APKToolGUI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap apkaio { - get { - object obj = ResourceManager.GetObject("apkaio", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap apkcombo { - get { - object obj = ResourceManager.GetObject("apkcombo", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap apkpure { - get { - object obj = ResourceManager.GetObject("apkpure", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -140,16 +110,6 @@ namespace APKToolGUI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap playstore { - get { - object obj = ResourceManager.GetObject("playstore", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/APKToolGUI/Properties/Resources.resx b/APKToolGUI/Properties/Resources.resx index 45fb24f..f401f56 100644 --- a/APKToolGUI/Properties/Resources.resx +++ b/APKToolGUI/Properties/Resources.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EgAACxIB0t1+/AAAAtVJREFUeF7tmzFu3DAQRfcoPoKBXGCP4pMErtK6TuVD5AB7gQBbGqncJU0AV6k3 + EQAACxEBf2RfkQAAAtVJREFUeF7tmzFu3DAQRfcoPoKBXGCP4pMErtK6TuVD5AB7gQBbGqncJU0AV6k3 /wdDQFgMxSFFDqlQH3jVcobzKYmSKO7p0KFDh1rq8/dPD+AJvIILuCVgG7ZlzIOk2ZdYOHgB70AzmQNz MNf4g4Eiz8BylEth7rN0N45Q1KMUpxXdAvb1KN33FQp5XhTmzbOU4S90zqN+XRTTC9bgezagQ17rH1LA CLAWn7kBHfH2pBUxAk9SZhuxg7sOR6TNICAxT3utwxGpezkgISe8ka75FKy13sSIZCPM9rlcpfxtQqKe @@ -392,73 +392,6 @@ ..\Resources\android-thin.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5gIUECEzhhsWEgAAAIFJREFU - OE+9jNENgCAMRPthHMYp3MRx3MUlWMJ91BLaXOCK+ONLXri0V6Rh3y71OJe5TCTnMi+jmJTWycu1w7Bj - dQgsR7mLFSMp3SWh6ePAciR2HLasVHLGjoMDy6Afq9hxyNKO7HWhk3OGLR+bYxU7FCwzX2FH6BB1+dOx - 8t8HIjeYr/a0lujdLAAAAABJRU5ErkJggg== - - - - - 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 - 88NQBeoAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5gIUESUj/gKpRQAABIRJREFU - WEfF11tMm2UYB/CvE8IkBrItZiYaYnCDlTGgg7VMb0jc2pVyKCzohV4bD9HEyEHmCj0YDzFRpybELBFd - NpfovXG94WKbG65xFHgprBzaFVqggx44ybry+Lzd97H3LW1hrJsX/4vS73v+P573Iy0CAMj+z3CA/LH5 - 3AKH5fN9TqOp0vWNnH3vcYUDZF+Hzp02K8kZaYZdY22RPI/xjDL8wx72mnSHA+y4BheFKwBZfVaS7WqG - nZ5myPGd8uf5zR++BT9mstemKxxA6IXfhb8AKCJz0EqyvC2QOd0CT822QM68wfFi+It69vp0hAfcQMA1 - BIiIjCEryfAjYK4VZPOtsCPYBrmhzkuFi1+Vsvc9SniADQF/YzmDkDmsRBZoBSH4IJmh9sieBXOXavHb - vez92wkPuIkAGxZTxPUHCOGWlbAAKVnBU4Hnwpa2Jvgti53zMOEBdgT8g4UU0YuREJcxSRA0z4QMzrzl - L5vYWVsND+hHQB+WSYi440iFiD0f4Y6ewqWvj7AzNwsPGERAPxbFI9hNOP9MiqDJCLVHdweN3Yql759n - ZycLDyAIGMSSVIjYJlIjaN6cbboBrr0GgKqn2Y748IBhBBAsSIW4iqGIFJvQTzcMwAiOdmJc2RPgfeEN - tofNRsAQDqeIATEPuQm9D8sJjh3GjGLGMW4c7825CjMvvcL2xTq5FxQwjINZxGabYBB6L5YP4MghjLSB - GAAziZnOAPDvPgvQtP5niz9lAE4EjOBQB0ZCbOWZwOOon2q0Qx+OkwB0AxQwgZEAPswsxp9tSgwYQ8At - HCghaDbbBCI+O/0TWXunzA52HBe/gXjAjAARn4APZyLAOAJGcaiEoMchIZJs4lNDN4kePQ5rR48BvF16 - /wg2PAMYBKwh4K5X6LLZhPVPVnyHAbgQMIaDKcKJiT8OaRN2DCIsHd0kUqmBe5VqiFaKiHcRQQF0AyJg - zYW/tVu4HBoXVGxfrJN7QQETOJwiKCDRJkSE2dhNVpUaWFWqIaJS30fQTbx8HOA9RIhHcM8pTCyPCq+z - PWx4gFsESIj44xA3YTL9TJYrTsC/RzDxCHETkQ8O9q46hHanU0j5QZUcwCKY4zCafiELh7WwVK6F5Qot - rFRQwAm4q9LEEJjoivLVszMq1ZY+qjcC3FiUCIGb6MDysEIHC4erYZEiEEA3sYKbWKlQw6LyWE+grErB - ztwsiQEusZxBGCznSKC0BkJlNNUxhLSJhXKt8065uoGdtdUkBkgIMafN58hcSS3Ml9TAOgI3EVRUB/wK - zUc2oXzbX1h5gAcBt0WAiPjEcp7MFtfBnUN1MHcIEaU0ushMibbLW1D1LHv/dpIS0G4+T6aL6mG2mKYO - /MW14CvRXXIXaQ6y9z1KeMAkAjxYjoiPzReIV94APrkeKGKqqJa45DU69vp0hAfcjl6k5W2mC2SysBGm - 5I3gOaCfGz9Q+36PUPUE/jFxRQytpl+Ju+AkuAtPRkb368/05+l2sdekOxxg33d/5PbLX7M48hs6b+bX - 7Gffe1zhAE8+IPsPdRQlTjbOQZ0AAAAASUVORK5CYII= - - ..\Resources\Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -471,7 +404,4 @@ ..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\apkaio.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/APKToolGUI/Resources/apkaio.png b/APKToolGUI/Resources/apkaio.png deleted file mode 100644 index 010cb3b..0000000 Binary files a/APKToolGUI/Resources/apkaio.png and /dev/null differ diff --git a/APKToolGUI/Resources/apkcombo.ico b/APKToolGUI/Resources/apkcombo.ico deleted file mode 100644 index 88d20e3..0000000 Binary files a/APKToolGUI/Resources/apkcombo.ico and /dev/null differ diff --git a/APKToolGUI/Resources/apkcombo.png b/APKToolGUI/Resources/apkcombo.png deleted file mode 100644 index 883df8e..0000000 Binary files a/APKToolGUI/Resources/apkcombo.png and /dev/null differ diff --git a/APKToolGUI/Resources/apkpure.ico b/APKToolGUI/Resources/apkpure.ico deleted file mode 100644 index e45e39c..0000000 Binary files a/APKToolGUI/Resources/apkpure.ico and /dev/null differ diff --git a/APKToolGUI/Resources/apkpure.png b/APKToolGUI/Resources/apkpure.png deleted file mode 100644 index a9662dd..0000000 Binary files a/APKToolGUI/Resources/apkpure.png and /dev/null differ diff --git a/APKToolGUI/Resources/playstore-2.png b/APKToolGUI/Resources/playstore-2.png deleted file mode 100644 index 3076a42..0000000 Binary files a/APKToolGUI/Resources/playstore-2.png and /dev/null differ diff --git a/APKToolGUI/Resources/playstore.ico b/APKToolGUI/Resources/playstore.ico deleted file mode 100644 index cbc156b..0000000 Binary files a/APKToolGUI/Resources/playstore.ico and /dev/null differ diff --git a/APKToolGUI/Resources/playstore.png b/APKToolGUI/Resources/playstore.png deleted file mode 100644 index 3076a42..0000000 Binary files a/APKToolGUI/Resources/playstore.png and /dev/null differ