Skip to content

Commit 527dc45

Browse files
edipo2sedipo2s
authored
Merge pull request #72 from edipo2s/develop
Develop
2 parents 2eb97bb + d124217 commit 527dc45

File tree

22 files changed

+151
-81
lines changed

22 files changed

+151
-81
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: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,9 @@ data class Card(
400400
val shout: Int,
401401
val creators: List<String>,
402402
val generates: List<String>,
403-
val tokens: List<String>
403+
val tokens: List<String>,
404+
val lore: String,
405+
val loreLink: String
404406

405407
) : Comparable<Card>, Parcelable {
406408

@@ -413,7 +415,7 @@ data class Card(
413415
val DUMMY = Card("", "", CardSet.CORE, CardAttribute.DUAL, CardAttribute.STRENGTH,
414416
CardAttribute.WILLPOWER, CardRarity.EPIC, false, 0, 0, 0, CardType.ACTION,
415417
CardRace.ARGONIAN, emptyList<CardKeyword>(), "", CardArenaTier.AVERAGE,
416-
listOf(), false, "", 0, listOf(), listOf(), listOf())
418+
listOf(), false, "", 0, listOf(), listOf(), listOf(), "", "")
417419

418420
const val ARTS_PATH = "Arts"
419421
const val ARTS_TOKENS_PATH = "TokensArts"
@@ -436,7 +438,7 @@ data class Card(
436438
1 == source.readInt(), source.readString(), source.readInt(),
437439
mutableListOf<String>().apply { source.readStringList(this) },
438440
mutableListOf<String>().apply { source.readStringList(this) },
439-
mutableListOf<String>().apply { source.readStringList(this) })
441+
mutableListOf<String>().apply { source.readStringList(this) }, source.readString(), source.readString())
440442

441443
override fun describeContents() = 0
442444

@@ -550,6 +552,8 @@ data class Card(
550552
dest?.writeStringList(creators)
551553
dest?.writeStringList(generates)
552554
dest?.writeStringList(tokens)
555+
dest?.writeString(lore)
556+
dest?.writeString(loreLink)
553557
}
554558

555559
override fun compareTo(other: Card): Int {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ abstract class FirebaseParsers {
3636
val creators: String = ""
3737
val generates: String = ""
3838
val tokens: String = ""
39+
val lore: String = ""
40+
val loreLink: String = ""
3941

4042
fun toCard(shortName: String, set: CardSet, attr: CardAttribute): Card {
4143
var clsAttr1 = attr
@@ -54,7 +56,7 @@ abstract class FirebaseParsers {
5456
},
5557
text, CardArenaTier.of(arenaTier), getCardArenaTierPlus(), evolves, season, shout,
5658
creators.split(", ").filter { it.isNotEmpty() }, generates.split(", ").filter { it.isNotEmpty() },
57-
tokens.split(", ").filter { it.isNotEmpty() })
59+
tokens.split(", ").filter { it.isNotEmpty() }, lore, loreLink)
5860
}
5961

6062
private fun getCardArenaTierPlus(): List<CardArenaTierPlus?> {

‎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: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ 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
1920
import android.support.design.widget.BottomSheetBehavior
2021
import android.support.v4.app.ActivityCompat
2122
import android.support.v4.app.ActivityOptionsCompat
23+
import android.support.v4.content.ContextCompat
2224
import android.support.v4.view.ViewCompat
2325
import android.support.v7.widget.*
2426
import android.text.format.DateUtils
@@ -318,6 +320,19 @@ class CardActivity : BaseActivity() {
318320
card_race.visibility = View.VISIBLE.takeIf { card.type == CardType.CREATURE } ?: View.GONE
319321
card_race_desc.text = card.race.desc
320322
card_race_desc.visibility = View.GONE.takeIf { card.race.desc.isEmpty() } ?: View.VISIBLE
323+
val hasLore = card.lore.isNotEmpty()
324+
card_lore_label.visibility = View.VISIBLE.takeIf { hasLore } ?: View.GONE
325+
card_lore_more.visibility = View.VISIBLE.takeIf { hasLore } ?: View.GONE
326+
card_lore.visibility = View.VISIBLE.takeIf { hasLore } ?: View.GONE
327+
card_lore.text = card.lore
328+
card_lore_more.setOnClickListener {
329+
CustomTabsIntent.Builder()
330+
.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
331+
.setStartAnimations(this, R.anim.slide_in_right, R.anim.slide_out_left)
332+
.setExitAnimations(this, R.anim.slide_in_left, R.anim.slide_out_right)
333+
.build()
334+
.launchUrl(this, Uri.parse(card.loreLink))
335+
}
321336
card_arena_tier.text = card.arenaTier.name.toLowerCase().capitalize()
322337
configureTokens()
323338
configureShoutLevels()

0 commit comments

Comments
 (0)