Skip to content

Commit 5763b22

Browse files
edipo2sedipo2s
committed
Improve build
1 parent a84be70 commit 5763b22

File tree

11 files changed

+69
-21
lines changed

11 files changed

+69
-21
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11

22
# Created by https://www.gitignore.io/api/android,intellij,osx,windows,linux,gradle,java
33

4+
secrets.properties
5+
AppsByEdipo.keystore
6+
47
### Android ###
58
# Built application files
69
*.apk

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
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 & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ apply plugin: 'io.fabric'
77

88
android {
99
compileSdkVersion 25
10-
buildToolsVersion "25.0.2"
10+
buildToolsVersion "25.0.3"
1111
packagingOptions.excludes = ['META-INF/services/javax.annotation.processing.Processor',
1212
'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'META-INF/README.txt',
1313
'LICENSE.txt', 'NOTICE.txt', 'README.txt', '.readme']
14+
15+
def props = new Properties()
16+
props.load(file("secrets.properties").newInputStream())
1417
defaultConfig {
1518
applicationId "com.ediposouza.teslesgendstracker"
1619
minSdkVersion prepareToRelease ? 16 : 21
@@ -21,31 +24,29 @@ android {
2124

2225
buildConfigField "boolean", "ENABLE_LOGS_IN_RELEASE", "false"
2326
buildConfigField "boolean", "PREPARE_TO_RELEASE", "$prepareToRelease"
24-
resValue "string", "app_ads_card_full", "$key_ads_card_full"
25-
resValue "string", "app_ads_card_list", "$key_ads_card_list"
26-
resValue "string", "app_ads_deck_list", "$key_ads_deck_list"
27-
resValue "string", "app_ads_new_deck_card_list", "$key_ads_new_deck_card_list"
28-
resValue "string", "app_ads_match_history_list", "$key_ads_match_history_list"
29-
resValue "string", "app_ads_match_statistics_class_full", "$key_ads_match_statistics_class_full"
30-
resValue "string", "app_ads_new_matches_full", "$key_ads_new_matches_full"
31-
resValue "string", "app_ads_news_list", "$key_ads_news_list"
32-
resValue "string", "app_ads_season_list", "$key_ads_season_list"
33-
resValue "string", "app_ads_patch_full", "$key_ads_patch_full"
34-
resValue "string", "key_ads_intersticial", "$key_ads_intersticial"
35-
resValue "string", "facebook_app_id", "$key_facebook_app_id"
36-
resValue "string", "mixpanel_app_id", "$key_mixpanel_app_id"
27+
resValue "string", "app_ads_card_full", props.getProperty('key_ads_card_full')
28+
resValue "string", "app_ads_card_list", props.getProperty('key_ads_card_list')
29+
resValue "string", "app_ads_deck_list", props.getProperty('key_ads_deck_list')
30+
resValue "string", "app_ads_new_deck_card_list", props.getProperty('key_ads_new_deck_card_list')
31+
resValue "string", "app_ads_match_history_list", props.getProperty('key_ads_match_history_list')
32+
resValue "string", "app_ads_match_statistics_class_full", props.getProperty('key_ads_match_statistics_class_full')
33+
resValue "string", "app_ads_new_matches_full", props.getProperty('key_ads_new_matches_full')
34+
resValue "string", "app_ads_news_list", props.getProperty('key_ads_news_list')
35+
resValue "string", "app_ads_season_list", props.getProperty('key_ads_season_list')
36+
resValue "string", "app_ads_patch_full", props.getProperty('key_ads_patch_full')
37+
resValue "string", "key_ads_intersticial", props.getProperty('key_ads_intersticial')
38+
resValue "string", "facebook_app_id", props.getProperty('key_facebook_app_id')
39+
resValue "string", "mixpanel_app_id", props.getProperty('key_mixpanel_app_id')
3740
multiDexEnabled true
3841
vectorDrawables.useSupportLibrary true
3942
}
4043
signingConfigs {
4144
release {
4245
try {
43-
def props = new Properties()
44-
props.load(file(propsFile).newInputStream())
45-
storeFile file(props.keystore_file)
46-
storePassword props.keystore_pass
46+
storeFile file('AppsByEdipo.keystore')
47+
storePassword props.getProperty('keystore_pass')
4748
keyAlias "tes_legends_tracker"
48-
keyPassword props.tes_legends_tracker_pass
49+
keyPassword props.getProperty('tes_legends_tracker_pass')
4950
} catch (e) {
5051
println(e.message)
5152
}

‎app/src/main/assets/Sounds/Core/Strength/stampedesentinel_attack.mp3‎

10.5 KB
Binary file not shown.

‎app/src/main/assets/Sounds/Core/Strength/stampedesentinel_enter_play.mp3‎

15 KB
Binary file not shown.

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/App.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.ediposouza.teslesgendstracker.util.MetricAction
1212
import com.ediposouza.teslesgendstracker.util.MetricsManager
1313
import com.google.firebase.auth.FirebaseAuth
1414
import com.google.firebase.database.FirebaseDatabase
15+
import com.google.firebase.iid.FirebaseInstanceId
1516
import com.jakewharton.threetenabp.AndroidThreeTen
1617
import hotchemi.android.rate.AppRate
1718
import timber.log.Timber
@@ -58,6 +59,7 @@ class App : MultiDexApplication() {
5859

5960
private fun initializeDependencies() {
6061
Timber.plant(LoggerManager())
62+
Timber.d("Device token: ${FirebaseInstanceId.getInstance().token}")
6163
MetricsManager.initialize(this)
6264
MetricsManager.trackAction(MetricAction.ACTION_APP_LAUNCH())
6365
AndroidThreeTen.init(this)

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/data/Card.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,19 @@ import android.graphics.BitmapFactory
88
import android.net.Uri
99
import android.os.Parcel
1010
import android.os.Parcelable
11+
import android.support.annotation.DrawableRes
12+
import android.support.v4.app.Fragment
13+
import com.bumptech.glide.Glide
14+
import com.bumptech.glide.load.engine.DiskCacheStrategy
15+
import com.bumptech.glide.request.RequestListener
16+
import com.bumptech.glide.request.animation.GlideAnimation
17+
import com.bumptech.glide.request.target.SimpleTarget
18+
import com.bumptech.glide.request.target.Target
1119
import com.ediposouza.teslesgendstracker.R
1220
import com.ediposouza.teslesgendstracker.TEXT_UNKNOWN
1321
import com.ediposouza.teslesgendstracker.util.getCurrentVersion
22+
import com.google.firebase.storage.FirebaseStorage
23+
import timber.log.Timber
1424

1525
/**
1626
* Created by ediposouza on 10/31/16.

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/interactor/FirebaseParsers.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ import com.ediposouza.teslesgendstracker.PATCH_UUID_PATTERN
66
import com.ediposouza.teslesgendstracker.SEASON_UUID_PATTERN
77
import com.ediposouza.teslesgendstracker.data.*
88
import com.ediposouza.teslesgendstracker.util.toIntSafely
9+
import org.threeten.bp.LocalDate
10+
import org.threeten.bp.LocalDateTime
11+
import org.threeten.bp.Month
12+
import org.threeten.bp.YearMonth
13+
import org.threeten.bp.format.DateTimeFormatter
914

1015
abstract class FirebaseParsers {
1116

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/DashActivity.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ class DashActivity : BaseFilterActivity(),
346346
}
347347
if (App.hasUserDonated()) {
348348
dash_navigation_view.menu.findItem(R.id.menu_donate)?.apply {
349-
isEnabled = false
350349
title = getString(R.string.menu_donate_done)
351350
icon = ContextCompat.getDrawable(this@DashActivity, R.drawable.ic_no_ads)
352351
}

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/cards/CardActivity.kt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ import android.os.Environment
1616
import android.os.Handler
1717
import android.provider.MediaStore
1818
import android.provider.Settings
19+
import android.support.customtabs.CustomTabsIntent
20+
import android.support.design.widget.BottomSheetBehavior
21+
import android.support.v4.app.ActivityCompat
22+
import android.support.v4.app.ActivityOptionsCompat
23+
import android.support.v4.content.ContextCompat
24+
import android.support.v4.view.ViewCompat
25+
import android.support.v7.widget.*
1926
import android.text.format.DateUtils
2027
import android.transition.Transition
2128
import android.view.ContextThemeWrapper
@@ -32,6 +39,19 @@ import com.ediposouza.teslesgendstracker.interactor.PublicInteractor
3239
import com.ediposouza.teslesgendstracker.ui.base.BaseActivity
3340
import com.ediposouza.teslesgendstracker.ui.base.CmdShowSnackbarMsg
3441
import com.ediposouza.teslesgendstracker.util.*
42+
import com.google.firebase.auth.FirebaseAuth
43+
import com.google.firebase.storage.FirebaseStorage
44+
import hotchemi.android.rate.AppRate
45+
import kotlinx.android.synthetic.main.activity_card.*
46+
import kotlinx.android.synthetic.main.include_card_info.*
47+
import kotlinx.android.synthetic.main.itemlist_card_full.view.*
48+
import kotlinx.android.synthetic.main.itemlist_card_min.view.*
49+
import org.jetbrains.anko.intentFor
50+
import org.jetbrains.anko.toast
51+
import org.threeten.bp.YearMonth
52+
import org.threeten.bp.format.DateTimeFormatter
53+
import org.threeten.bp.format.TextStyle
54+
import timber.log.Timber
3555
import java.io.File
3656
import java.util.*
3757

0 commit comments

Comments
 (0)