Skip to content

Commit 60edfd8

Browse files
committed
update: version 1.0 is complete
1 parent 845a445 commit 60edfd8

Some content is hidden

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

71 files changed

+235887
-329
lines changed

app/app.iml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
</content>
9191
<orderEntry type="jdk" jdkName="Android API 22 Platform (1)" jdkType="Android SDK" />
9292
<orderEntry type="sourceFolder" forTests="false" />
93+
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
9394
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
9495
<orderEntry type="library" exported="" name="greendao-2.0.0" level="project" />
9596
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />

app/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,20 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313
}
14-
buildTypes {
14+
buildTypes {
1515
release {
1616
minifyEnabled false
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
2021
}
2122

2223
dependencies {
2324
compile fileTree(dir: 'libs', include: ['*.jar'])
2425
compile 'com.android.support:appcompat-v7:22.2.0'
2526
compile 'com.android.support:support-v4:22.2.0'
2627
compile files('libs/greendao-2.0.0.jar')
27-
28-
29-
30-
31-
32-
28+
compile 'com.google.code.gson:gson:2.2.4'
3329

3430
}

app/src/androidTest/java/com/com/kuviam/dopa/ApplicationTest.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/src/androidTest/java/com/com/kuviam/dopa/ConfigureTests.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

app/src/androidTest/java/com/com/kuviam/dopa/MainActivityTests.java

Lines changed: 0 additions & 90 deletions
This file was deleted.

app/src/androidTest/java/com/com/kuviam/dopa/NewLocusTests.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.kuviam.dopa" >
4-
4+
<!-- Internet permission -->
5+
<uses-permission android:name="android.permission.INTERNET" />
56
<application
7+
android:name=".db.GreenDaoApplication"
68
android:allowBackup="true"
79
android:icon="@drawable/logo"
810
android:label="@string/app_name"
9-
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
10-
android:name = "com.kuviam.dopa.db.GreenDaoApplication">>
11+
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
12+
>
1113
<activity
12-
android:name="com.kuviam.dopa.MainActivity"
14+
android:name=".MainActivity"
1315
android:label="@string/app_name" >
1416
<intent-filter>
1517
<action android:name="android.intent.action.MAIN" />
@@ -18,42 +20,45 @@
1820
</intent-filter>
1921
</activity>
2022
<activity
21-
android:name="com.kuviam.dopa.mindpalace.Mindpalace"
23+
android:name=".mindpalace.Mindpalace"
2224
android:label="@string/title_activity_mindpalace" >
2325
</activity>
2426
<activity
25-
android:name="com.kuviam.dopa.Arena.Arena"
27+
android:name=".Arena.Arena"
2628
android:label="Arena" >
2729
</activity>
2830
<activity
2931
android:name=".mindpalace.NewLocus"
3032
android:label="Add" >
3133
</activity>
3234
<activity
33-
android:name="com.kuviam.dopa.Help"
35+
android:name=".Help"
3436
android:label="@string/title_activity_help" >
3537
</activity>
3638
<activity
37-
android:name="com.kuviam.dopa.Arena.Configure"
39+
android:name=".Arena.Configure"
3840
android:label="Cards" >
3941
</activity>
4042
<activity
41-
android:name="com.kuviam.dopa.Arena.NewDiscipline"
43+
android:name=".Arena.NewDiscipline"
4244
android:label="@string/title_activity_new_discipline" >
4345
</activity>
4446
<activity
45-
android:name="com.kuviam.dopa.Arena.Mgym"
47+
android:name=".Arena.Mgym"
4648
android:label="@string/title_activity_mgym" >
4749
</activity>
4850
<activity
49-
android:name="com.kuviam.dopa.Arena.Score"
51+
android:name=".Arena.Score"
5052
android:label="@string/title_activity_score" >
5153
</activity>
5254
<activity
53-
android:name="com.kuviam.dopa.Arena.Recall"
55+
android:name=".Arena.Recall"
5456
android:label="@string/title_activity_recall" >
5557
</activity>
56-
58+
<activity
59+
android:name=".analytics.Analytics"
60+
android:label="@string/title_activity_analytics" >
61+
</activity>
5762
</application>
5863

5964
</manifest>

0 commit comments

Comments
 (0)