Revert to 26cea8ceb7
This commit is contained in:
Daniil Shevtsov
parent
f67d3bb61e
commit
d83ce2cc8d
|
|
@ -1,5 +0,0 @@
|
|||
<application>
|
||||
<component name="LafManager">
|
||||
<laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" />
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<application>
|
||||
<component name="PathMacrosImpl">
|
||||
<macro name="KOTLIN_BUNDLED" value="/snap/android-studio/80/android-studio/plugins/Kotlin/kotlinc" />
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<application>
|
||||
<component name="AndroidFirstRunPersistentData">
|
||||
<version>1</version>
|
||||
</component>
|
||||
<component name="whatsNew">
|
||||
<shownVersion>3.5.1</shownVersion>
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
<code_scheme name="Default" version="173">
|
||||
<codeStyleSettings language="XML">
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
</indentOptions>
|
||||
<arrangement>
|
||||
<rules>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:android</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:id</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>style</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
</rules>
|
||||
</arrangement>
|
||||
</codeStyleSettings>
|
||||
</code_scheme>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<code_scheme name="TouchInstinct" version="173">
|
||||
<code_scheme name="TouchInstinct">
|
||||
<option name="GENERATE_FINAL_LOCALS" value="true" />
|
||||
<option name="GENERATE_FINAL_PARAMETERS" value="true" />
|
||||
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
||||
|
|
@ -31,56 +31,27 @@
|
|||
<option name="RIGHT_MARGIN" value="150" />
|
||||
<option name="JD_P_AT_EMPTY_LINES" value="false" />
|
||||
<AndroidXmlCodeStyleSettings>
|
||||
<option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
|
||||
<option name="USE_CUSTOM_SETTINGS" value="true" />
|
||||
<option name="LAYOUT_SETTINGS">
|
||||
<value>
|
||||
<option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
|
||||
<option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
|
||||
<option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="MANIFEST_SETTINGS">
|
||||
<value>
|
||||
<option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
|
||||
<option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OTHER_SETTINGS">
|
||||
<value>
|
||||
<option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
|
||||
<option name="INSERT_LINE_BREAK_AFTER_LAST_ATTRIBUTE" value="true" />
|
||||
</value>
|
||||
</option>
|
||||
</AndroidXmlCodeStyleSettings>
|
||||
<JavaCodeStyleSettings>
|
||||
<option name="GENERATE_FINAL_LOCALS" value="true" />
|
||||
<option name="GENERATE_FINAL_PARAMETERS" value="true" />
|
||||
<option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
|
||||
<option name="ANNOTATION_PARAMETER_WRAP" value="1" />
|
||||
<option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
|
||||
<option name="IMPORT_LAYOUT_TABLE">
|
||||
<value>
|
||||
<package name="android" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="junit" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="net" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javax" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="" withSubpackages="true" static="true" />
|
||||
<emptyLine />
|
||||
</value>
|
||||
</option>
|
||||
<option name="JD_P_AT_EMPTY_LINES" value="false" />
|
||||
</JavaCodeStyleSettings>
|
||||
<JetCodeStyleSettings>
|
||||
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
|
||||
|
|
@ -89,8 +60,32 @@
|
|||
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
|
||||
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
|
||||
</JetCodeStyleSettings>
|
||||
<Objective-C-extensions>
|
||||
<file>
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
|
||||
</file>
|
||||
<class>
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
|
||||
</class>
|
||||
<extensions>
|
||||
<pair source="cpp" header="h" />
|
||||
<pair source="c" header="h" />
|
||||
</extensions>
|
||||
</Objective-C-extensions>
|
||||
<XML>
|
||||
<option name="XML_SPACE_INSIDE_EMPTY_TAG" value="false" />
|
||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
||||
</XML>
|
||||
<codeStyleSettings language="JAVA">
|
||||
|
|
@ -381,6 +376,7 @@
|
|||
</arrangement>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="XML">
|
||||
<option name="FORCE_REARRANGE_MODE" value="1" />
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
</indentOptions>
|
||||
|
|
@ -391,7 +387,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:android</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
@ -402,7 +397,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
@ -414,7 +408,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>.*:id</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
@ -425,7 +418,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>.*:name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
@ -436,7 +428,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
@ -447,7 +438,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>style</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
@ -458,7 +448,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
@ -469,12 +458,64 @@
|
|||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<NAME>.*:layout_width</NAME>
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:layout_height</NAME>
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:layout_.*</NAME>
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:width</NAME>
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:height</NAME>
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
|
|
@ -482,7 +523,6 @@
|
|||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
<application>
|
||||
<component name="EditorColorsManagerImpl">
|
||||
<global_color_scheme name="Darcula" />
|
||||
</component>
|
||||
</application>
|
||||
95
debugger.xml
95
debugger.xml
|
|
@ -1,95 +0,0 @@
|
|||
<application>
|
||||
<component name="DebuggerSettings">
|
||||
<filter>
|
||||
<option name="PATTERN" value="com.sun.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="java.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="javax.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="org.omg.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="sun.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="jdk.internal.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="junit.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="com.intellij.rt.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="com.yourkit.runtime.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="com.springsource.loaded.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="org.springsource.loaded.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="javassist.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="org.apache.webbeans.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="com.ibm.ws.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
<filter>
|
||||
<option name="PATTERN" value="kotlin.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
<option name="INCLUDE" value="true" />
|
||||
</filter>
|
||||
</component>
|
||||
<component name="XDebuggerSettings">
|
||||
<data-views />
|
||||
<general />
|
||||
<debuggers>
|
||||
<debugger id="ObjectiveC">
|
||||
<configuration>
|
||||
<option name="VALUES_FILTER_ENABLED" value="false" />
|
||||
</configuration>
|
||||
</debugger>
|
||||
<debugger id="kotlin_debugger">
|
||||
<configuration>
|
||||
<option name="DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED" value="true" />
|
||||
</configuration>
|
||||
</debugger>
|
||||
</debuggers>
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<application>
|
||||
<component name="DefaultFont">
|
||||
<option name="FONT_SIZE" value="18" />
|
||||
</component>
|
||||
</application>
|
||||
17
find.xml
17
find.xml
|
|
@ -1,17 +0,0 @@
|
|||
<application>
|
||||
<component name="FindSettings">
|
||||
<option name="caseSensitive" value="true" />
|
||||
<option name="customScope" value="All Places" />
|
||||
<option name="defaultScopeName" value="All Places" />
|
||||
<option name="CASE_SENSITIVE_SEARCH" value="true" />
|
||||
<option name="SEARCH_SCOPE" value="All Places" />
|
||||
<option name="FILE_MASK" value="*.xml" />
|
||||
<mask>*.css</mask>
|
||||
<mask>*.html</mask>
|
||||
<mask>*.jsp</mask>
|
||||
<mask>*.properties</mask>
|
||||
<mask>*.java</mask>
|
||||
<mask>*.kt</mask>
|
||||
<mask>*.xml</mask>
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<application>
|
||||
<component name="GeneralSettings">
|
||||
<option name="confirmExit" value="false" />
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<application>
|
||||
<component name="NotificationConfiguration">
|
||||
<notification groupId="Build sync orphan modules" displayType="NONE" shouldLog="false" />
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<application>
|
||||
<component name="StudioFlags">
|
||||
<option name="data">
|
||||
<map>
|
||||
<entry key="gradle.ide.new.sync" value="false" />
|
||||
<entry key="gradle.ide.single.variant.sync" value="false" />
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
</application>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<application>
|
||||
<component name="UISettings">
|
||||
<option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
|
||||
</component>
|
||||
</application>
|
||||
Loading…
Reference in New Issue