Fix Android app in template project
This commit is contained in:
+2
-1
@@ -3,7 +3,8 @@
|
|||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:supportsRtl="true">
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/AppTheme">
|
||||||
<activity android:name=".MainActivity">
|
<activity android:name=".MainActivity">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
|
|||||||
+6
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#6200EE</color>
|
||||||
|
<color name="colorPrimaryDark">#3700B3</color>
|
||||||
|
<color name="colorAccent">#03DAC5</color>
|
||||||
|
</resources>
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- Base application theme. -->
|
||||||
|
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
+10
@@ -104,6 +104,16 @@ interface AndroidModuleConfigurator : ModuleConfigurator,
|
|||||||
"src" / "main" / "AndroidManifest.xml"
|
"src" / "main" / "AndroidManifest.xml"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val colorsXml = FileTemplateDescriptor(
|
||||||
|
"android/colors.xml",
|
||||||
|
"src" / "main" / "res" / "values" / "colors.xml"
|
||||||
|
)
|
||||||
|
|
||||||
|
val stylesXml = FileTemplateDescriptor(
|
||||||
|
"android/styles.xml",
|
||||||
|
"src" / "main" / "res" / "values" / "styles.xml"
|
||||||
|
)
|
||||||
|
|
||||||
fun mainActivityKt(javaPackage: JavaPackage) = FileTemplateDescriptor(
|
fun mainActivityKt(javaPackage: JavaPackage) = FileTemplateDescriptor(
|
||||||
"android/MainActivity.kt.vm",
|
"android/MainActivity.kt.vm",
|
||||||
"src" / "main" / "java" / javaPackage.asPath() / "MainActivity.kt"
|
"src" / "main" / "java" / javaPackage.asPath() / "MainActivity.kt"
|
||||||
|
|||||||
+7
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators
|
package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators
|
||||||
|
|
||||||
|
|
||||||
@@ -95,6 +100,8 @@ object AndroidSinglePlatformModuleConfigurator :
|
|||||||
listOf(
|
listOf(
|
||||||
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.activityMainXml, modulePath, settings),
|
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.activityMainXml, modulePath, settings),
|
||||||
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.androidManifestXml, modulePath, settings),
|
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.androidManifestXml, modulePath, settings),
|
||||||
|
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.colorsXml, modulePath, settings),
|
||||||
|
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.stylesXml, modulePath, settings),
|
||||||
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.mainActivityKt(javaPackage), modulePath, settings)
|
FileTemplate(AndroidModuleConfigurator.FileTemplateDescriptors.mainActivityKt(javaPackage), modulePath, settings)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user