mirror of
https://gitee.com/zhangsken/AndroidIDE.git
synced 2026-10-16 07:49:44 +08:00
Resolved merge conflicts
This commit is contained in:
Generated
-17
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<runningDeviceTargetSelectedWithDropDown>
|
||||
<Target>
|
||||
<type value="RUNNING_DEVICE_TARGET" />
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="SERIAL_NUMBER" />
|
||||
<value value="b36e6c44" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</runningDeviceTargetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2021-12-15T14:47:15.024577200Z" />
|
||||
</component>
|
||||
</project>
|
||||
Binary file not shown.
@@ -285,11 +285,17 @@ public class MainActivity extends StudioActivity implements View.OnClickListener
|
||||
.setId (3)
|
||||
.setName (this, R.string.template_kotlin_basic)
|
||||
.setDescription (this, R.string.template_description_kotlin_basic)
|
||||
.setImageId (R.drawable.template_basic);
|
||||
.setImageId (R.drawable.template_basic),
|
||||
libgdx = new ProjectTemplate ()
|
||||
.setId (4)
|
||||
.setName (this, R.string.template_libgdx)
|
||||
.setDescription (this, R.string.template_description_libgdx)
|
||||
.setImageId (R.drawable.template_libgdx);
|
||||
mTemplates.add (empty);
|
||||
mTemplates.add (basic);
|
||||
mTemplates.add (drawer);
|
||||
mTemplates.add (kotlinBasic);
|
||||
mTemplates.add (libgdx);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,13 @@ public class ProjectWriter {
|
||||
"app/src/main/AndroidManifest.xml",
|
||||
"app/src/main/res/values/strings.xml",
|
||||
"app/src/main/java/$package_name/MainActivity.java",
|
||||
"app/src/main/java/$package_name/MainActivity.kt"
|
||||
"app/src/main/java/$package_name/MainActivity.kt",
|
||||
"app/build.gradle",
|
||||
"app/src/main/java/$package_name/AndroidLauncher.java",
|
||||
"app/res/values/strings.xml",
|
||||
"core/build.gradle",
|
||||
"core/src/main/java/$package_name/GameSuperClass.java",
|
||||
"app/AndroidManifest.xml"
|
||||
};
|
||||
|
||||
private static final String JAVA_PATH_REGEX = "/.*/src/.*/java|kt";
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 7.6 KiB |
@@ -156,6 +156,8 @@
|
||||
<string name="template_navigation_drawer">Navigation drawer project</string>
|
||||
<string name="template_kotlin_basic">Kotlin Basic Project</string>
|
||||
<string name="template_description_kotlin_basic">Kotlin project with Appcompat Toolbar and a Floating Action Button</string>
|
||||
<string name="template_libgdx">LibGDX Game</string>
|
||||
<string name="template_description_libgdx">LibGDX game project set up to render an image as an example.</string>
|
||||
|
||||
<!-- Files -->
|
||||
<string name="save">Save</string>
|
||||
|
||||
Reference in New Issue
Block a user