Skip to content

Commit c7841e7

Browse files
PerrigoGamesPerrigoGames
committed
Version 2.0
1 parent ffa9d62 commit c7841e7

File tree

153 files changed

+5455
-787
lines changed

Some content is hidden

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

153 files changed

+5455
-787
lines changed

‎.idea/dictionaries/Life4.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'kotlin-kapt'
55
apply plugin: 'io.fabric'
6-
apply plugin: 'io.objectbox' // apply last
76

87
ext {
98
play_services_version = "15.0.1"
10-
retrofit2_version = "2.5.0"
9+
retrofit2_version = "2.6.0"
1110
okhttp3_version = "3.12.0"
1211
kotlin_coroutine_version = "1.0.1"
1312
dagger2_version = "2.22"
@@ -18,7 +17,7 @@ android {
1817
upload {
1918
storeFile file('../../keystores/upload-keystore.jks')
2019
keyPassword 'FlOnG9T#0sNe41bXjKtVJi75Y'
21-
storePassword 'Ndb%TJQfsJ5c8%qLHP4QEG%Y@'
20+
storePassword 'FlOnG9T#0sNe41bXjKtVJi75Y'
2221
keyAlias = 'upload'
2322
}
2423
debug {
@@ -33,8 +32,8 @@ android {
3332
applicationId "com.perrigogames.life4trials"
3433
minSdkVersion 16
3534
targetSdkVersion 28
36-
versionCode 27
37-
versionName "1.2.4"
35+
versionCode 28
36+
versionName "2.0"
3837
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3938
multiDexEnabled true
4039
signingConfig signingConfigs.upload
@@ -46,6 +45,9 @@ android {
4645
signingConfig signingConfigs.upload
4746
manifestPlaceholders = [providerName: "com.perrigogames.fileprovider"]
4847
}
48+
preview {
49+
initWith release
50+
}
4951
debug {
5052
applicationIdSuffix ".debug"
5153
signingConfig signingConfigs.debug
@@ -92,7 +94,6 @@ dependencies {
9294
// Retrofit2
9395
implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
9496
implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
95-
implementation "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2"
9697

9798
// Okhttp3
9899
implementation "com.squareup.okhttp3:okhttp:$okhttp3_version"
@@ -103,21 +104,25 @@ dependencies {
103104
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutine_version"
104105

105106
// Google Drive
106-
implementation 'com.google.android.gms:play-services-auth:16.0.1'
107-
implementation 'com.google.http-client:google-http-client-gson:1.26.0'
108-
implementation('com.google.api-client:google-api-client-android:1.26.0') {
109-
exclude group: 'org.apache.httpcomponents'
110-
}
111-
implementation('com.google.apis:google-api-services-drive:v3-rev136-1.25.0') {
112-
exclude group: 'org.apache.httpcomponents'
113-
}
107+
// implementation 'com.google.android.gms:play-services-auth:16.0.1'
108+
// implementation 'com.google.http-client:google-http-client-gson:1.26.0'
109+
// implementation('com.google.api-client:google-api-client-android:1.26.0') {
110+
// exclude group: 'org.apache.httpcomponents'
111+
// }
112+
// implementation('com.google.apis:google-api-services-drive:v3-rev136-1.25.0') {
113+
// exclude group: 'org.apache.httpcomponents'
114+
// }
115+
116+
debugImplementation "io.objectbox:objectbox-android-objectbrowser:$objectboxVersion"
117+
releaseImplementation "io.objectbox:objectbox-android:$objectboxVersion"
114118

115119
// Dagger2
116120
implementation "com.google.dagger:dagger-android:$dagger2_version"
117121
implementation "com.google.dagger:dagger-android-support:$dagger2_version"
118122
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
119123
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
120124
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
125+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
121126
kapt "com.google.dagger:dagger-compiler:$dagger2_version"
122127
kapt "com.google.dagger:dagger-android-processor:$dagger2_version"
123128

@@ -132,3 +137,4 @@ dependencies {
132137
}
133138

134139
apply plugin: 'com.google.gms.google-services'
140+
apply plugin: 'io.objectbox' // apply last

‎app/objectbox-models/default.json

Lines changed: 99 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
"id": "1:897729382389109926",
88
"lastPropertyId": "11:4687129921278289407",
9-
"name": "SongDB",
9+
"name": "TrialSongResultDB",
1010
"properties": [
1111
{
1212
"id": "1:8766572468174205243",
@@ -77,33 +77,117 @@
7777
"relations": []
7878
},
7979
{
80-
"id": "3:5121322014264730323",
81-
"lastPropertyId": "3:6482824092841661256",
80+
"id": "4:3550087585911202435",
81+
"lastPropertyId": "5:2807419384847361086",
82+
"name": "ChartDB",
83+
"properties": [
84+
{
85+
"id": "1:2261428690331898312",
86+
"name": "difficultyClass"
87+
},
88+
{
89+
"id": "2:5881916565998638573",
90+
"name": "difficultyNumber"
91+
},
92+
{
93+
"id": "3:7915110439707899891",
94+
"name": "playStyle"
95+
},
96+
{
97+
"id": "4:5156906940983289518",
98+
"name": "id"
99+
},
100+
{
101+
"id": "5:2807419384847361086",
102+
"indexId": "2:2179306308437673584",
103+
"name": "songId"
104+
}
105+
],
106+
"relations": []
107+
},
108+
{
109+
"id": "5:8259428376274226022",
110+
"lastPropertyId": "4:8156728067762894280",
111+
"name": "SongDB",
112+
"properties": [
113+
{
114+
"id": "1:7474618414295292202",
115+
"name": "title"
116+
},
117+
{
118+
"id": "2:4035254530351899273",
119+
"name": "artist"
120+
},
121+
{
122+
"id": "3:1848766116061709151",
123+
"name": "version"
124+
},
125+
{
126+
"id": "4:8156728067762894280",
127+
"name": "id"
128+
}
129+
],
130+
"relations": []
131+
},
132+
{
133+
"id": "6:7996573366626203407",
134+
"lastPropertyId": "4:7576977601798902236",
135+
"name": "LadderResultDB",
136+
"properties": [
137+
{
138+
"id": "1:7353156616830171450",
139+
"name": "score"
140+
},
141+
{
142+
"id": "2:6907817080132173099",
143+
"name": "clearType"
144+
},
145+
{
146+
"id": "3:7664573071473972433",
147+
"name": "id"
148+
},
149+
{
150+
"id": "4:7576977601798902236",
151+
"indexId": "3:4803047367100923710",
152+
"name": "chartId"
153+
}
154+
],
155+
"relations": []
156+
},
157+
{
158+
"id": "7:8378601917918727635",
159+
"lastPropertyId": "4:1126330018225707462",
82160
"name": "GoalStatusDB",
83161
"properties": [
84162
{
85-
"id": "1:1411004893783989070",
163+
"id": "1:8622093348279456954",
86164
"name": "goalId"
87165
},
88166
{
89-
"id": "2:8351987538112467256",
167+
"id": "2:5752760647110202871",
168+
"name": "status"
169+
},
170+
{
171+
"id": "3:6070475126404484374",
90172
"name": "date"
91173
},
92174
{
93-
"id": "3:6482824092841661256",
94-
"name": "status"
175+
"id": "4:1126330018225707462",
176+
"name": "id"
95177
}
96178
],
97179
"relations": []
98180
}
99181
],
100-
"lastEntityId": "3:5121322014264730323",
101-
"lastIndexId": "1:5226183221815835245",
182+
"lastEntityId": "7:8378601917918727635",
183+
"lastIndexId": "3:4803047367100923710",
102184
"lastRelationId": "0:0",
103185
"lastSequenceId": "0:0",
104186
"modelVersion": 4,
105187
"modelVersionParserMinimum": 4,
106-
"retiredEntityUids": [],
188+
"retiredEntityUids": [
189+
5121322014264730323
190+
],
107191
"retiredIndexUids": [],
108192
"retiredPropertyUids": [
109193
4452517186195381522,
@@ -113,7 +197,11 @@
113197
6901520264293461872,
114198
4673429769246954315,
115199
1515691241437566925,
116-
4613967305044127438
200+
4613967305044127438,
201+
1411004893783989070,
202+
8351987538112467256,
203+
6482824092841661256,
204+
2651789998399070060
117205
],
118206
"retiredRelationUids": [],
119207
"version": 1

‎app/src/debug/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources>
2-
<string name="app_name">LIFE4 Trials Debug</string>
2+
<string name="app_name">LIFE4 Debug</string>
33
<string name="file_provider_name">com.perrigogames.fileprovider.debug</string>
44
</resources>

‎app/src/main/AndroidManifest.xml

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
99
<uses-permission android:name="android.permission.CAMERA" />
1010
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
11+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1112

1213
<dist:module dist:instant="true" />
1314

@@ -16,29 +17,47 @@
1617
android:allowBackup="true"
1718
android:icon="@mipmap/ic_launcher"
1819
android:label="@string/app_name"
20+
android:networkSecurityConfig="@xml/network_security_config"
1921
android:roundIcon="@mipmap/ic_launcher_round"
2022
android:supportsRtl="true"
2123
android:theme="@style/AppTheme"
2224
tools:ignore="AllowBackup">
25+
<activity android:name=".activity.PlacementListActivity"></activity>
2326

2427
<meta-data
2528
android:name="com.google.firebase.messaging.default_notification_channel_id"
2629
android:value="ID_UPDATES_CHANNEL" />
2730

2831
<activity
29-
android:name=".activity.FirstRunActivity"
30-
android:theme="@style/AppTheme.NoActionBar"/>
31-
<activity
32-
android:name=".activity.TrialListActivity"
33-
android:label="@string/app_name"
32+
android:name=".activity.LaunchActivity"
3433
android:screenOrientation="portrait"
3534
android:theme="@style/AppTheme.Launcher">
3635
<intent-filter>
3736
<action android:name="android.intent.action.MAIN" />
3837
<action android:name="android.intent.action.VIEW" />
38+
3939
<category android:name="android.intent.category.LAUNCHER" />
4040
</intent-filter>
4141
</activity>
42+
<activity
43+
android:name=".activity.FirstRunInfoActivity"
44+
android:screenOrientation="portrait"
45+
android:theme="@style/AppTheme.NoActionBar"
46+
android:windowSoftInputMode="adjustPan" />
47+
<activity
48+
android:name=".activity.FirstRunActivity"
49+
android:screenOrientation="portrait"
50+
android:theme="@style/AppTheme.NoActionBar"
51+
android:windowSoftInputMode="adjustPan" />
52+
<activity
53+
android:name=".activity.PlayerProfileActivity"
54+
android:label="@string/app_name"
55+
android:screenOrientation="portrait" />
56+
<activity
57+
android:name=".activity.TrialListActivity"
58+
android:label="@string/app_name"
59+
android:parentActivityName=".activity.PlayerProfileActivity"
60+
android:screenOrientation="portrait" />
4261
<activity
4362
android:name=".activity.TrialDetailsActivity"
4463
android:screenOrientation="portrait" />
@@ -52,19 +71,30 @@
5271
android:screenOrientation="portrait" />
5372
<activity
5473
android:name=".activity.TrialRecordsActivity"
55-
android:label="@string/title_activity_records" />
74+
android:label="@string/title_activity_records"
75+
android:screenOrientation="portrait" />
5676
<activity
5777
android:name=".activity.RankListActivity"
5878
android:screenOrientation="portrait" />
5979
<activity
6080
android:name=".activity.SettingsActivity"
6181
android:label="@string/title_activity_settings" />
82+
<activity android:name=".activity.RankDetailsActivity" />
83+
<activity android:name=".activity.Life4DescriptionActivity" />
84+
<activity android:name=".activity.PlacementDetailsActivity" />
85+
<activity android:name=".activity.MatrixTestActivity" />
6286
<activity
63-
android:name=".activity.RankDetailsActivity"/>
64-
<activity
65-
android:name=".activity.Life4DescriptionActivity" />
87+
android:name=".activity.LadderLeaderboardActivity"
88+
android:screenOrientation="portrait"/>
6689
<activity
67-
android:name=".activity.PlacementDetailsActivity" />
90+
android:name=".activity.SingleSongTournamentActivity"
91+
android:parentActivityName=".activity.PlayerProfileActivity"
92+
android:theme="@style/AppTheme.NoActionBar">
93+
<meta-data
94+
android:name="android.support.PARENT_ACTIVITY"
95+
android:value="com.perrigogames.life4trials.activity.PlayerProfileActivity" />
96+
</activity>
97+
<activity android:name=".activity.FirstRankSelectionActivity" />
6898

6999
<service
70100
android:name=".api.Life4FirebaseMessagingService"
@@ -78,7 +108,7 @@
78108
android:name=".util.NotificationCopyHandler"
79109
android:enabled="true">
80110
<intent-filter>
81-
<action android:name="ACTION_COPY_CLIPBOARD"/>
111+
<action android:name="ACTION_COPY_CLIPBOARD" />
82112
</intent-filter>
83113
</receiver>
84114

0 commit comments

Comments
 (0)