From ab7fac584cb199fb17c9def883f4fa00470e6d9c Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Tue, 28 Dec 2021 18:38:26 +0530
Subject: [PATCH] Updated about page

---
 .idea/misc.xml                                |  4 +++
 .../com/itsaky/androidide/AboutActivity.java  | 10 +++----
 .../com/itsaky/androidide/EditorActivity.java |  2 +-
 .../fragments/preferences/IDEPreferences.java |  2 +-
 app/src/main/res/drawable/ic_github.xml       | 28 +++++++++++++++++++
 app/src/main/res/layout/activity_about.xml    |  6 ++--
 .../main/res/layout/layout_about_items.xml    |  4 +--
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/xml/motion_about.xml         |  3 +-
 .../androidide/app/BaseApplication.java       | 18 ++++++++++--
 .../colorpicker/ColorPickerView.java          |  4 +++
 11 files changed, 64 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_github.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9b2a71619..8f3ac843d 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,10 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/app/src/main/res/drawable/ic_github.xml" value="0.21837606837606838" />
+        <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/app/src/main/res/layout/activity_about.xml" value="0.2" />
+        <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/app/src/main/res/layout/layout_about_items.xml" value="0.20512820512820512" />
+        <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/common/src/main/res/layout/layout_color_picker.xml" value="0.20512820512820512" />
         <entry key="..\:/Projects/AndroidStudioProjects/android-ide/app/src/main/res/drawable-mdpi/bg_widgets_list.xml" value="0.3105485232067511" />
         <entry key="..\:/Projects/AndroidStudioProjects/android-ide/app/src/main/res/drawable-mdpi/ic_widget_progress.xml" value="0.3071729957805907" />
         <entry key="..\:/Projects/AndroidStudioProjects/android-ide/app/src/main/res/drawable/bg_design_container_background.xml" value="0.3105485232067511" />
diff --git a/app/src/main/java/com/itsaky/androidide/AboutActivity.java b/app/src/main/java/com/itsaky/androidide/AboutActivity.java
index 5034dae46..d2d26a8d7 100755
--- a/app/src/main/java/com/itsaky/androidide/AboutActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/AboutActivity.java
@@ -56,11 +56,11 @@ public class AboutActivity extends StudioActivity {
         
         LayoutAboutItemsBinding items = binding.items;
         TooltipCompat.setTooltipText(items.discuss, getString(R.string.discussions_on_telegram));
-        TooltipCompat.setTooltipText(items.issueTracker, getString(R.string.user_suggestions));
+        TooltipCompat.setTooltipText(items.github, getString(R.string.title_github));
         TooltipCompat.setTooltipText(items.email, getString(R.string.about_option_email));
         TooltipCompat.setTooltipText(items.website, getString(R.string.about_option_website));
-        items.issueTracker.setOnClickListener(v -> {
-            getApp().openIssueTracker();
+        items.github.setOnClickListener(v -> {
+            getApp().openGitHub ();
         });
         items.discuss.setOnClickListener(v -> {
             getApp().openTelegramGroup();
@@ -74,7 +74,7 @@ public class AboutActivity extends StudioActivity {
     }
     
     private void setupLicenses() {
-        final List<License> licenses = new ArrayList<>();
+        final var licenses = new ArrayList<License>();
         licenses.add(new License("AndroidX Libraries", "Apache License 2.0", "https://github.com/androidx/androidx"));
         licenses.add(new License("Gradle Build Tool", "Apache License 2.0", "https://github.com/gradle/gradle"));
         licenses.add(new License("Gson", "Apache License 2.0", "https://github.com/google/gson"));
@@ -90,7 +90,7 @@ public class AboutActivity extends StudioActivity {
         licenses.add(new License("Guava-Android", "Apache License 2.0", "https://github.com/google/guava"));
         licenses.add(new License("LSP4J", "Eclipse Public License 2.0", "https://github.com/eclipse/lsp4j"));
         licenses.add(new License("Jsoup", "MIT License", "https://github.com/jhy/jsoup"));
-        licenses.add(new License("Android-Terminal-Emulator", "Apache License 2.0", "https://github.com/jackpal/Android-Terminal-Emulator"));
+        licenses.add(new License("Termux [Terminal Emulator]", "GPL 3", "https://github.com/termux/termux-app"));
         licenses.add(new License("JavaPoet", "Apache License 2.0", "https://github.com/square/JavaPoet"));
         licenses.add(new License("Zip4j", "Apache License 2.0", "https://github.com/srikanth-lingala/zip4j"));
         
diff --git a/app/src/main/java/com/itsaky/androidide/EditorActivity.java b/app/src/main/java/com/itsaky/androidide/EditorActivity.java
index df802cf00..2c48d70d9 100755
--- a/app/src/main/java/com/itsaky/androidide/EditorActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/EditorActivity.java
@@ -767,7 +767,7 @@ public class EditorActivity extends StudioActivity implements FileTreeFragment.F
         if(id == R.id.editornav_discuss) {
             getApp().openTelegramGroup();
         } else if(id == R.id.editornav_suggest) {
-            getApp().openIssueTracker();
+            getApp().openGitHub ();
         } else if(id == R.id.editornav_needHelp) {
             showNeedHelpDialog();
         } else if(id == R.id.editornav_settings) {
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java
index a7fa531f2..f0c25c9e0 100755
--- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java
+++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java
@@ -195,7 +195,7 @@ public class IDEPreferences extends BasePreferenceFragment {
 				} else if(key.equals(KEY_TELEGRAM)) {
 					StudioApp.getInstance().openTelegramGroup();
 				} else if(key.equals(KEY_ISSUES)) {
-					StudioApp.getInstance().openIssueTracker();
+					StudioApp.getInstance().openGitHub ();
 				} else if(key.equals(KEY_ABOUT)) {
                     startActivity(new Intent(getContext(), AboutActivity.class));
                 }
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
new file mode 100644
index 000000000..2068fb5d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  This file is part of AndroidIDE.
+  ~
+  ~  AndroidIDE is free software: you can redistribute it and/or modify
+  ~  it under the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation, either version 3 of the License, or
+  ~  (at your option) any later version.
+  ~
+  ~  AndroidIDE is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~  GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License
+  ~   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,2A10,10 0,0 0,2 12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0,0 0,12 2Z"/>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index a5de3ed15..321635b45 100755
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.motion.widget.MotionLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-    app:layoutDescription="@xml/motion_about">
+	app:layoutDescription="@xml/motion_about">
 
 	<View
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/layout_about_items.xml b/app/src/main/res/layout/layout_about_items.xml
index 0ff62b3d0..78e153654 100755
--- a/app/src/main/res/layout/layout_about_items.xml
+++ b/app/src/main/res/layout/layout_about_items.xml
@@ -22,11 +22,11 @@
 			android:gravity="center">
 
 			<ImageView
-				android:id="@+id/issue_tracker"
+				android:id="@+id/github"
 				android:layout_height="30dp"
 				android:layout_width="30dp"
 				android:scaleType="fitCenter"
-				app:srcCompat="@drawable/ic_bug"
+				app:srcCompat="@drawable/ic_github"
 				android:layout_marginStart="16dp"
 				android:layout_marginEnd="16dp"
 				android:layout_marginTop="8dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2800d9ec9..0cf923a02 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="msg_share_app">AndroidIDE is an Integrated Development Environment for building Android apps on your Android Smartphone. It supports :\n1. Gradle \n2. OpenJDK 11.0.1.\n3. Advanced Java auto completion\n4. XML Auto Completion \n5. Kotlin Support and much more.\n\nDownload AndroidIDE at https://androidide.com</string>
 	<string name="msg_need_help">If you\'re facing issues while using AndroidIDE or with building Android Apps, you can join the Telegram Group ask for help there.\n\nYou can also send suggesstions on our email.</string>
     <string name="discuss_amp_help">Discuss &amp; help</string>
-    <string name="user_suggestions">Issue tracker</string>
+    <string name="title_github">GitHub</string>
     <string name="need_help">Need Help?</string>
     <string name="other">Other</string>
     <string name="share_with_friends">Share with Friends</string>
diff --git a/app/src/main/res/xml/motion_about.xml b/app/src/main/res/xml/motion_about.xml
index fe6cf59ac..d8b0c0980 100755
--- a/app/src/main/res/xml/motion_about.xml
+++ b/app/src/main/res/xml/motion_about.xml
@@ -28,8 +28,7 @@
 
     
     
-    <ConstraintSet
-        android:id="@+id/start">
+    <ConstraintSet>
         
         <Constraint
             app:layout_constraintStart_toStartOf="parent"
diff --git a/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java b/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java
index 41690c84f..bb595cdf5 100755
--- a/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java
+++ b/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java
@@ -24,6 +24,8 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
+
+import androidx.annotation.NonNull;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.multidex.MultiDexApplication;
 import com.blankj.utilcode.util.EncodeUtils;
@@ -37,6 +39,9 @@ import com.itsaky.androidide.utils.FileUtil;
 import com.itsaky.androidide.utils.JavaCharacter;
 import com.itsaky.androidide.utils.StudioUtils;
 import com.itsaky.toaster.Toaster;
+
+import org.jetbrains.annotations.Contract;
+
 import java.io.File;
 import java.util.Arrays;
 
@@ -54,7 +59,7 @@ public abstract class BaseApplication extends MultiDexApplication {
     public static final String NOTIFICATION_ID_UPDATE = "17571";
     public static final String NOTIFICATION_ID_DEVS = "17572";
     public static final String TELEGRAM_GROUP_URL = "https://t.me/androidide_discussions";
-    public static final String SUGGESTIONS_URL = "https://github.com/itsaky/AndroidIDE";
+    public static final String GITHUB_URL = "https://github.com/itsaky/AndroidIDE";
     public static final String WEBSITE = "https://androidide.com";
     public static final String EMAIL = "contact@androidide.com";
     
@@ -154,10 +159,14 @@ public abstract class BaseApplication extends MultiDexApplication {
         return Environment.mkdirIfNotExits(new File("/data/data/com.itsaky.androidide/files"));
     }
 
+    @NonNull
+    @Contract(" -> new")
     public final File getLogSenderDir() {
         return new File(getRootDir(), "logsender");
     }
 
+    @NonNull
+    @Contract(" -> new")
     public final File getToolsDownloadDirectory() {
         return new File(getRootDir(), "downloads");
     }
@@ -170,6 +179,8 @@ public abstract class BaseApplication extends MultiDexApplication {
         return Environment.mkdirIfNotExits(new File(FileUtil.getExternalStorageDir() /*getTempProjectDir() */, "classes"));
     }
 
+    @NonNull
+    @Contract(" -> new")
     public final String getDownloadRequestUrl() {
         return new String(EncodeUtils.base64Decode("aHR0cHM6Ly9hbmRyb2lkaWRlLmNvbS9idWlsZC90b29scy9kb3dubG9hZC8="));
 	}
@@ -214,6 +225,7 @@ public abstract class BaseApplication extends MultiDexApplication {
         return Arrays.stream(android.os.Build.SUPPORTED_ABIS).anyMatch("armeabi-v7a"::equals);
     }
 
+    @NonNull
     public static String getArch() {
         if (BaseApplication.isAarch64()) {
             return "arm64-v8a";
@@ -287,11 +299,11 @@ public abstract class BaseApplication extends MultiDexApplication {
         }
     }
 
-    public void openIssueTracker() {
+    public void openGitHub () {
         try {
             Intent open = new Intent();
             open.setAction(Intent.ACTION_VIEW);
-            open.setData(Uri.parse(BaseApplication.SUGGESTIONS_URL));
+            open.setData(Uri.parse(BaseApplication.GITHUB_URL));
             open.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(open); 
         } catch (Throwable th) {
diff --git a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java b/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java
index ffc2fa038..a43d0a52f 100644
--- a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java
+++ b/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.graphics.Color;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -68,6 +69,9 @@ public class ColorPickerView extends LinearLayout {
         
         this.binding = LayoutColorPickerBinding.inflate (LayoutInflater.from (context));
         
+        removeAllViews ();
+        addView (binding.getRoot (), new LayoutParams (ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        
         init ();
     }