Skip to content

Commit 856d189

Browse files
iplay88keysiplay88keys
committed
Merge changes to update to Ionic 2
2 parents 950bb24 + 65d25ab commit 856d189

File tree

118 files changed

+974
-159750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+974
-159750
lines changed

‎.editorconfig

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
# http://editorconfig.org
1+
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
2+
# editorconfig.org
3+
24
root = true
35

46
[*]
5-
charset = utf-8
67
indent_style = space
78
indent_size = 2
9+
10+
# We recommend you to keep these unchanged
811
end_of_line = lf
9-
insert_final_newline = true
12+
charset = utf-8
1013
trim_trailing_whitespace = true
14+
insert_final_newline = true
1115

1216
[*.md]
13-
insert_final_newline = false
1417
trim_trailing_whitespace = false

‎.gitignore

+28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
11
# Specifies intentionally untracked files to ignore when using Git
22
# http://git-scm.com/docs/gitignore
33

4+
*~
5+
*.sw[mnpcod]
6+
*.log
7+
*.tmp
8+
*.tmp.*
9+
log.txt
10+
*.sublime-project
11+
*.sublime-workspace
12+
.vscode/
13+
npm-debug.log*
14+
15+
.idea/
16+
.sass-cache/
17+
.tmp/
18+
.versions/
19+
coverage/
20+
dist/
421
node_modules/
22+
tmp/
23+
temp/
24+
hooks/
525
platforms/
626
plugins/
27+
plugins/android.json
28+
plugins/ios.json
29+
www/
30+
$RECYCLE.BIN/
31+
32+
.DS_Store
33+
Thumbs.db
34+
UserInterfaceState.xcuserstate

‎LICENSE

-339
This file was deleted.

‎README.md

-1
This file was deleted.

‎bower.json

-7
This file was deleted.

‎config.xml

+29-33
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<widget id="com.ionicframework.showtracker328277" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
3-
<name>showTracker</name>
4-
<description>
5-
An Ionic Framework and Cordova project.
6-
</description>
7-
<author email="[email protected]" href="http://example.com.com/">
8-
Your Name Here
9-
</author>
2+
<widget id="com.ionicframework.showtrackerapp802096" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
3+
<name>ShowTracker</name>
4+
<description>Show Tracker</description>
5+
<author email="" href="https://github.com/iplay88keys/showtrackerapp"></author>
106
<content src="index.html"/>
117
<access origin="*"/>
8+
<allow-intent href="http://*/*"/>
9+
<allow-intent href="https://*/*"/>
10+
<allow-intent href="tel:*"/>
11+
<allow-intent href="sms:*"/>
12+
<allow-intent href="mailto:*"/>
13+
<allow-intent href="geo:*"/>
14+
<platform name="android">
15+
<allow-intent href="market:*"/>
16+
</platform>
17+
<platform name="ios">
18+
<allow-intent href="itms:*"/>
19+
<allow-intent href="itms-apps:*"/>
20+
</platform>
1221
<preference name="webviewbounce" value="false"/>
1322
<preference name="UIWebViewBounce" value="false"/>
1423
<preference name="DisallowOverscroll" value="true"/>
15-
<preference name="SplashScreenDelay" value="1000"/>
16-
<preference name="FadeSplashScreenDuration" value="1000"/>
1724
<preference name="android-minSdkVersion" value="16"/>
1825
<preference name="BackupWebStorage" value="none"/>
19-
<preference name="SplashScreen" value="screen"/>
26+
<preference name="SplashScreenDelay" value="0"/>
27+
<preference name="FadeSplashScreen" value="false"/>
28+
<preference name="FadeSplashScreenDuration" value="0"/>
29+
<preference name="SplashScreenBackgroundColor" value="0xFFFFFFFF"/>
2030
<feature name="StatusBar">
21-
<param name="ios-package" value="CDVStatusBar" onload="true"/>
31+
<param name="ios-package" onload="true" value="CDVStatusBar"/>
2232
</feature>
23-
<platform name="android">
24-
<icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
25-
<icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
26-
<icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
27-
<icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
28-
<icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
29-
<icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
30-
<splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
31-
<splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
32-
<splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
33-
<splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
34-
<splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
35-
<splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
36-
<splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
37-
<splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
38-
<splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
39-
<splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
40-
<splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
41-
<splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
42-
</platform>
43-
</widget>
33+
<plugin name="cordova-plugin-device" spec="~1.1.3"/>
34+
<plugin name="cordova-plugin-console" spec="~1.0.4"/>
35+
<plugin name="cordova-plugin-whitelist" spec="~1.3.0"/>
36+
<plugin name="cordova-plugin-splashscreen" spec="~4.0.0"/>
37+
<plugin name="cordova-plugin-statusbar" spec="~2.2.0"/>
38+
<plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
39+
</widget>

‎gulpfile.js

-51
This file was deleted.

‎hooks/README.md

-83
This file was deleted.

‎hooks/after_prepare/010_add_platform_class.js

-94
This file was deleted.

‎ionic.config.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "ShowTracker",
3+
"app_id": "",
4+
"v2": true,
5+
"typescript": true
6+
}

‎ionic.project

-4
This file was deleted.

0 commit comments

Comments
 (0)