Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
flutter_plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林生雨
flutter_plugin
Commits
ea6f7169
Commit
ea6f7169
authored
5 years ago
by
林生雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit
parent
47cc9bac
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
139 deletions
+10
-139
workspace.xml
.idea/workspace.xml
+0
-0
MergeTest.iml
MergeTest/.idea/MergeTest.iml
+0
-10
Project.xml
MergeTest/.idea/codeStyles/Project.xml
+0
-117
modules.xml
MergeTest/.idea/modules.xml
+0
-9
workspace.xml
MergeTest/.idea/workspace.xml
+0
-0
build_file_checksums.ser
android/.idea/caches/build_file_checksums.ser
+0
-0
vcs.xml
android/.idea/vcs.xml
+7
-0
build.gradle
android/build.gradle
+3
-3
No files found.
.idea/workspace.xml
View file @
ea6f7169
This diff is collapsed.
Click to expand it.
MergeTest/.idea/MergeTest.iml
deleted
100644 → 0
View file @
47cc9bac
<?xml version="1.0" encoding="UTF-8"?>
<module
type=
"JAVA_MODULE"
version=
"4"
>
<component
name=
"NewModuleRootManager"
inherit-compiler-output=
"true"
>
<exclude-output
/>
<content
url=
"file://$MODULE_DIR$"
/>
<orderEntry
type=
"inheritedJdk"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
</component>
</module>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
MergeTest/.idea/codeStyles/Project.xml
deleted
100644 → 0
View file @
47cc9bac
<component
name=
"ProjectCodeStyleConfiguration"
>
<code_scheme
name=
"Project"
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>
</component>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
MergeTest/.idea/modules.xml
deleted
100644 → 0
View file @
47cc9bac
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ProjectModuleManager"
>
<modules>
<module
fileurl=
"file://$PROJECT_DIR$/.idea/MergeTest.iml"
filepath=
"$PROJECT_DIR$/.idea/MergeTest.iml"
/>
</modules>
</component>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
MergeTest/.idea/workspace.xml
deleted
100644 → 0
View file @
47cc9bac
This diff is collapsed.
Click to expand it.
android/.idea/caches/build_file_checksums.ser
View file @
ea6f7169
No preview for this file type
This diff is collapsed.
Click to expand it.
android/.idea/vcs.xml
0 → 100644
View file @
ea6f7169
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"VcsDirectoryMappings"
>
<mapping
directory=
"$PROJECT_DIR$/.."
vcs=
"Git"
/>
</component>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
android/build.gradle
View file @
ea6f7169
...
...
@@ -37,9 +37,9 @@ android {
}
}
sourceSets
{
main
.
java
.
srcDirs
+=
'src/main/kotlin'
}
//
sourceSets {
//
main.java.srcDirs += 'src/main/kotlin'
//
}
lintOptions
{
disable
'InvalidPackage'
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment