Skip to content

edit .editorconfig and .gitignore #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 31, 2025
Merged

edit .editorconfig and .gitignore #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c66205
edit .editorconfig and .gitignore
komsikov Aug 31, 2025
09dbc8c
edit android icon name
komsikov Aug 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = false
root = true

[*]
end_of_line = lf
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ node_modules
test/qml/Output
test/build.*
test/.cache

.DS_Store
2 changes: 1 addition & 1 deletion platform/android/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def build(app, title, release):
print("Failed to create android app")
return
os.system('rsync -a ./ %s/www --exclude=%s ' %(app,app))
os.system('cp androidIcon.png %s' %(app))
os.system('cp icon.png %s' %(app))
os.system('cp config.xml %s' %(app))
os.chdir(app)

Expand Down
56 changes: 29 additions & 27 deletions platform/android/dist/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="{{ domain | default('com.pureqml.app') }}" version="{{ version | default('1.0.0') }}" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>{{ title }}</name>
<description>
<widget id="{{ domain | default('com.pureqml.app') }}" version="{{ version | default('1.0.0') }}"
xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>{{ title }}</name>
<description>
{{ description | default('Override app description in manifest') }}
</description>
<author email="{{ author.email | default('[email protected]') if author is defined else '[email protected]' }}" href="{{ author.site | default('http://pureqml.com') if author is defined else 'http://pureqml.com' }}">
</description>
<author email="{{ author.email | default('[email protected]') if author is defined else '[email protected]' }}" href="{{ author.site | default('http://pureqml.com') if author is defined else 'http://pureqml.com' }}">
{{ author.name | default('John Doe') if author is defined else 'John Doe' }}
</author>
<content src="index.html" />
<access origin="*" />
<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
<allow-intent href="tel:*" />
<allow-intent href="sms:*" />
<allow-intent href="mailto:*" />
<allow-intent href="geo:*" />
<platform name="android">
<allow-intent href="market:*" />
<icon src="{{ androidIcon.ldpi | default('androidIcon.png') if androidIcon is defined else 'androidIcon.png' }}" density="ldpi" />
<icon src="{{ androidIcon.mdpi | default('androidIcon.png') if androidIcon is defined else 'androidIcon.png' }}" density="mdpi" />
<icon src="{{ androidIcon.hdpi | default('androidIcon.png') if androidIcon is defined else 'androidIcon.png' }}" density="hdpi" />
<icon src="{{ androidIcon.xhdpi | default('androidIcon.png') if androidIcon is defined else 'androidIcon.png' }}" density="xhdpi" />
</platform>
<platform name="ios">
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
</platform>
<engine name="android" spec="^6.2.3" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
</author>
<content src="index.html" />
<access origin="*" />
<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
<allow-intent href="tel:*" />
<allow-intent href="sms:*" />
<allow-intent href="mailto:*" />
<allow-intent href="geo:*" />
<platform name="android">
<allow-intent href="market:*" />
<icon src="{{ icon.ldpi | default('icon.png') if icon is defined else 'icon.png' }}" density="ldpi" />
<icon src="{{ icon.mdpi | default('icon.png') if icon is defined else 'icon.png' }}" density="mdpi" />
<icon src="{{ icon.hdpi | default('icon.png') if icon is defined else 'icon.png' }}" density="hdpi" />
<icon src="{{ icon.xhdpi | default('icon.png') if icon is defined else 'icon.png' }}" density="xhdpi" />
</platform>
<platform name="ios">
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
</platform>
<engine name="android" spec="^6.2.3" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
</widget>