From 87f729a84f92a2625219084ca0ff22a32ab63c95 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Tue, 15 Nov 2022 18:23:37 +0530
Subject: [PATCH] Fixed import issue

---
 app/release/output-metadata.json              |   4 ++--
 .../com/itsaky/androidide/EditorActivity.java |   2 +-
 .../itsaky/androidide/app/BaseIDEActivity.kt  |  15 ---------------
 settings.gradle                               |   6 +++---
 tests/test-home/.androidide/init/model.jar    | Bin 65261 -> 65261 bytes
 uidesigner/build.gradle                       |   1 +
 6 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 389216848..fe52fbb7e 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 212,
-      "versionName": "2.1.2-beta",
+      "versionCode": 213,
+      "versionName": "2.1.3-beta",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/com/itsaky/androidide/EditorActivity.java b/app/src/main/java/com/itsaky/androidide/EditorActivity.java
index 4bc2890e4..3871187cb 100755
--- a/app/src/main/java/com/itsaky/androidide/EditorActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/EditorActivity.java
@@ -22,7 +22,7 @@ package com.itsaky.androidide;
 import static com.blankj.utilcode.util.IntentUtils.getShareTextIntent;
 import static com.itsaky.androidide.preferences.internal.GeneralPreferencesKt.NO_OPENED_PROJECT;
 import static com.itsaky.androidide.preferences.internal.GeneralPreferencesKt.setLastOpenedProject;
-import static com.itsaky.androidide.resources.R.string;
+import static com.itsaky.androidide.R.*;
 import static com.itsaky.toaster.ToastUtilsKt.toast;
 import static com.itsaky.toaster.ToastUtilsKt.toastInfo;
 
diff --git a/common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt b/common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt
index b5d684c2f..19b597524 100755
--- a/common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt
+++ b/common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt
@@ -14,21 +14,6 @@
  *  You should have received a copy of the GNU General Public License
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
-
-/**
- * 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:></https:>//www.gnu.org/licenses/>.
- */
 package com.itsaky.androidide.app
 
 import android.Manifest.permission
diff --git a/settings.gradle b/settings.gradle
index befa62167..a0ad43071 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,6 @@
 rootProject.name = "AndroidIDE"
+include ':annotation-processors'
+include ':annotations'
 include ':actions'
 include ':app'
 include ':common'
@@ -44,7 +46,5 @@ include ':build-tools:xml-utils'
 include ':editor'
 include ':preferences'
 include ':resources'
-include ':xml-inflater'
-include ':annotation-processors'
-include ':annotations'
 include ':uidesigner'
+include ':xml-inflater'
diff --git a/tests/test-home/.androidide/init/model.jar b/tests/test-home/.androidide/init/model.jar
index fe65ecd7d89ec0fe216ac8df8031e0079bf37dbe..4e544dd630d668fe287433ad3a8ae6cae777f3e9 100644
GIT binary patch
delta 584
zcmXBQT_}TL6bJBa?`H2bv?wByNJvwxU7(ht*a#`n5+z@SEFZ;?5&1~tCD{cRN>W^S
z6}3ppg$qm~xkAc?*51v>7#sT^H|N*?dCqe>Jx)L4^fStGJtGYjiC9*2V4YK@N`h6R
zN3|rOuBV}1<^(Gz7w3UOu`UQdAs%61sO(09<45@{FtNqpfGx*mghIl?NY$YdUd89h
zp(<rV7L>E67a=kkrBYa_)|0E*3UX6xr?%#Nti<o;KZQe^!J>u<=6#xeJGMyeos*fg
z(#lM92=4dh&2+9=+QN$b)AB|noZXrZgK_o;jOPPKxzv|?^1sH^=`YQhKC3049p|y=
z+k06<=8P^4;9U3!?%I_F<boFHgaR-olmLfN1`^#yFyw9k5AG_U^;83^rw$07ZqW2<
z0(Y-HpyI6)9KX?nnD+&w?e|6y_0bFlKgNN~TLbF7?cl=O5A>f+fdA|T8DDf~`)Waw
r`no`$kEY!F+K>$2G<xTI07?Bb3U+@wK(e0}wE0_+WC42D5g7gh`)(2i

delta 584
zcmXBQT_}T57zgle?`H2bv?wBye1tT`+J&u_qS$CeB8k#`6e1txGb3UWUXopKp(MqH
zcQv(0%7qI|BDpfHTxjjxhA}qwKW?61|8t)6^mJT7$`z!fdMzc4<nd^lmsz_k%@TyG
zLW^olL*2<ny(tV=M$A`%622x3JIkM>V5I0?fa7QJBIu*bz%i}IWsF2X!&upg6y7GQ
z#88&8D+<fla!L`Y+zKJAmTQSy1rp+((ni|a)L4nNsGZT!tTW1C%IFc9{xH2p+I!~m
z$V!_F@e#PUu8fj%#ri&0WStwkv2bzU6a|xP4vc3*r$wZ%==^_;`HNpN$8_01e6e38
zqR;xejm$K<6@YQ$BbYmPJ`i(Cpy7(aG*=GnTqQ{LG=gzY3vhU9fYMtBmb^`X^Y#OS
zuMa%>20+zY4>)@x4-(#2kq+KlLEJ|h82gw3B7Z$-_IH76|1i*g8UXt_2y(y3o%yRB
sNf_t_Ljf}7DbR_e`zE6gzekYdKU2W+(+$#tWI=PV14$Gj@47=1e+(MY`Tzg`

diff --git a/uidesigner/build.gradle b/uidesigner/build.gradle
index b5050a6a0..95b55a10c 100644
--- a/uidesigner/build.gradle
+++ b/uidesigner/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     
     implementation project(path: ':common')
     implementation project(path: ':logger')
+    implementation project(path: ':resources')
     implementation project(path: ':xml-inflater')
     
     testImplementation tests.junit