diff --git a/.idea/copyright/Akash_Yadav.xml b/.idea/copyright/Akash_Yadav.xml index e3094f0c1..70c6abdc6 100755 --- a/.idea/copyright/Akash_Yadav.xml +++ b/.idea/copyright/Akash_Yadav.xml @@ -1,6 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 8336e9f78..5bfd388ab 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -144,11 +144,18 @@ + + + + + + + diff --git a/actions/build.gradle b/actions/build.gradle index 653185dbf..c1f471947 100644 --- a/actions/build.gradle +++ b/actions/build.gradle @@ -16,6 +16,10 @@ android { sourceCompatibility rootProject.ext.javaSourceVersion targetCompatibility rootProject.ext.javaTargetVersion } + + kotlinOptions { + jvmTarget = "11" + } buildTypes { release { @@ -32,6 +36,7 @@ dependencies { implementation androidx.ktx implementation common.kotlin } + repositories { mavenCentral() -} +} \ No newline at end of file diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar index b5ac15296..5c01e14a9 100644 Binary files a/app/src/main/assets/data/common/tooling-api-all.jar and b/app/src/main/assets/data/common/tooling-api-all.jar differ diff --git a/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java b/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java index 0972126f2..3472a6110 100644 --- a/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java +++ b/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java @@ -39,6 +39,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Collections; import java.util.LinkedList; +import java.util.Locale; /** * A document provider for the Storage Access Framework which exposes the files in the $HOME/ @@ -117,7 +118,7 @@ public class IDEDocumentsProvider extends DocumentsProvider { final String name = file.getName(); final int lastDot = name.lastIndexOf('.'); if (lastDot >= 0) { - final String extension = name.substring(lastDot + 1).toLowerCase(); + final String extension = name.substring(lastDot + 1).toLowerCase(Locale.ROOT); final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension); if (mime != null) return mime; } @@ -265,7 +266,7 @@ public class IDEDocumentsProvider extends DocumentsProvider { if (file.isDirectory()) { Collections.addAll(pending, file.listFiles()); } else { - if (file.getName().toLowerCase().contains(query)) { + if (file.getName().toLowerCase(Locale.ROOT).contains(query)) { includeFile(result, null, file); } } diff --git a/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java b/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java index 9db62320a..e852adfec 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java +++ b/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java @@ -26,7 +26,6 @@ import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.ResourceUtils; import com.blankj.utilcode.util.ThreadUtils; -import com.blankj.utilcode.util.ZipUtils; import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.interfaces.ProjectWriterCallback; @@ -39,6 +38,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.ZipEntry; @@ -172,8 +172,9 @@ public class ProjectWriter { try { ZipEntry ze = null; while ((ze = zin.getNextEntry()) != null) { - if (ze.getName().startsWith(details.language.toLowerCase()) && !ze.isDirectory()) { - String name = ze.getName().replaceFirst(details.language.toLowerCase(), ""); + final var prefix = details.language.toLowerCase(Locale.ROOT); + if (ze.getName().startsWith(prefix) && !ze.isDirectory()) { + String name = ze.getName().replaceFirst(prefix, ""); if (name.contains(PACKAGE_NAME)) { name = name.replace(PACKAGE_NAME, details.packageName.replace(".", "/")); } diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt b/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt index 6ddfe99a5..643201b3b 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt +++ b/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt @@ -309,11 +309,12 @@ open class EditorActionsMenu(val editor: IDEEditor) : super.show() } + @SuppressLint("InflateParams") private fun findWidestItem(): Int { var widest = 0 val text = - LayoutInflater.from(editor.context).inflate(R.layout.layout_popup_menu_item, null) as - MaterialTextView + LayoutInflater.from(editor.context).inflate(R.layout.layout_popup_menu_item, null) + as MaterialTextView val dp30 = SizeUtils.dp2px(30f) val paddingHorizontal = text.paddingStart + text.paddingEnd val drawablePadding = text.compoundDrawablePadding @@ -346,8 +347,7 @@ open class EditorActionsMenu(val editor: IDEEditor) : val view: MaterialTextView = if (convertView == null || convertView !is MaterialButton) { (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater) - .inflate(R.layout.layout_popup_menu_item, parent, false) as - MaterialTextView + .inflate(R.layout.layout_popup_menu_item, parent, false) as MaterialTextView } else { convertView as MaterialTextView } diff --git a/app/src/main/res/drawable/bg_log_search_field.xml b/app/src/main/res/drawable/bg_log_search_field.xml deleted file mode 100644 index 5164b8dc1..000000000 --- a/app/src/main/res/drawable/bg_log_search_field.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left.xml deleted file mode 100755 index e2bac3191..000000000 --- a/app/src/main/res/drawable/ic_chevron_left.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_comment_line.xml b/app/src/main/res/drawable/ic_comment_line.xml deleted file mode 100755 index d2b207bd8..000000000 --- a/app/src/main/res/drawable/ic_comment_line.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml deleted file mode 100644 index d977c6809..000000000 --- a/app/src/main/res/drawable/ic_copy.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_find_references.xml b/app/src/main/res/drawable/ic_find_references.xml deleted file mode 100755 index dccbadf6b..000000000 --- a/app/src/main/res/drawable/ic_find_references.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_goto_definition.xml b/app/src/main/res/drawable/ic_goto_definition.xml deleted file mode 100755 index 48a9a60b0..000000000 --- a/app/src/main/res/drawable/ic_goto_definition.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_install.xml b/app/src/main/res/drawable/ic_install.xml deleted file mode 100755 index dff50ed0b..000000000 --- a/app/src/main/res/drawable/ic_install.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_quickfix.xml b/app/src/main/res/drawable/ic_quickfix.xml deleted file mode 100644 index 2aec73471..000000000 --- a/app/src/main/res/drawable/ic_quickfix.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_text_actions.xml b/app/src/main/res/drawable/ic_text_actions.xml deleted file mode 100644 index 1de5f6515..000000000 --- a/app/src/main/res/drawable/ic_text_actions.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_text_actions_horizontal.xml b/app/src/main/res/drawable/ic_text_actions_horizontal.xml deleted file mode 100644 index 4b66cb835..000000000 --- a/app/src/main/res/drawable/ic_text_actions_horizontal.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_uncomment_line.xml b/app/src/main/res/drawable/ic_uncomment_line.xml deleted file mode 100755 index 4da85cdf7..000000000 --- a/app/src/main/res/drawable/ic_uncomment_line.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_widget_linear.xml b/app/src/main/res/drawable/ic_widget_linear.xml index acda24ede..563ecabab 100644 --- a/app/src/main/res/drawable/ic_widget_linear.xml +++ b/app/src/main/res/drawable/ic_widget_linear.xml @@ -15,8 +15,8 @@ ~ along with AndroidIDE. If not, see . --> + android:animateLayoutChanges="true" + tools:ignore="DuplicateIncludedIds"> + android:layout_height="match_parent" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> + app:layout_constraintVertical_bias="0.25" /> + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/main_image" /> + android:textColor="@color/primaryTextColorLight" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/getStarted" />