Skip to content

Commit 3301539

Browse files
edipo2sedipo2s
committed
Merge branch 'release/v0.4.1'
2 parents 4be8722 + db6a0f1 commit 3301539

File tree

12 files changed

+57
-31
lines changed

12 files changed

+57
-31
lines changed

‎.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: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ android {
3838
println(e.message)
3939
}
4040
}
41+
release {
42+
storeFile file('debug.keystore')
43+
keyAlias 'androiddebugkey'
44+
keyPassword 'android'
45+
storePassword 'android'
46+
}
4147
}
4248
buildTypes {
4349
debug {
@@ -46,27 +52,28 @@ android {
4652
}
4753
release {
4854
debuggable false
49-
signingConfig signingConfigs.release
55+
signingConfig signingConfigs.debug
5056
minifyEnabled true
5157
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
5258
}
5359
}
5460
sourceSets {
5561
main.java.srcDirs += 'src/main/kotlin'
5662
}
63+
5764
}
5865

5966
ext {
60-
anko_version = "0.9"
67+
anko_version = "0.9.1a"
6168
icePickVersion = "3.2.+"
6269
okIOVersion = "1.11.+"
6370
okHttpVersion = "3.6.+"
6471
playServicesVersion = prepareToRelease ? "10.0.1" : "9.8.0"
6572
supportLibraryVersion = "25.1.1"
6673
threetenabpVersion = "1.0.+"
6774

68-
testMockitoVersion = "2.1.+"
69-
testRoboletricVersion = "3.1.+"
75+
testMockitoVersion = "2.7.+"
76+
testRoboletricVersion = "3.2.+"
7077
}
7178

7279
configurations.all {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
<application
1919
android:name=".App"
2020
android:allowBackup="true"
21+
android:fullBackupContent="@xml/backup_descriptor"
2122
android:icon="@mipmap/ic_launcher"
2223
android:label="@string/app_name"
24+
android:largeHeap="true"
2325
android:supportsRtl="true"
24-
android:theme="@style/AppTheme"
25-
android:fullBackupContent="@xml/backup_descriptor">
26+
android:theme="@style/AppTheme">
2627

2728
<activity
2829
android:name=".ui.DashActivity"
@@ -76,8 +77,8 @@
7677

7778
<receiver
7879
android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver"
79-
android:permission="android.permission.INSTALL_PACKAGES"
80-
android:enabled="true">
80+
android:enabled="true"
81+
android:permission="android.permission.INSTALL_PACKAGES">
8182
<intent-filter>
8283
<action android:name="com.android.vending.INSTALL_REFERRER" />
8384
</intent-filter>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.ediposouza.teslesgendstracker.ui.matches.tabs
22

33
import android.os.Bundle
4+
import android.support.v4.app.ActivityCompat
45
import android.support.v4.app.ActivityOptionsCompat
56
import android.view.*
67
import com.ediposouza.teslesgendstracker.R
@@ -35,7 +36,7 @@ class ArenaFragment : MatchesHistoryFragment() {
3536
super.onViewCreated(view, savedInstanceState)
3637
arena_fab_add.setOnClickListener {
3738
val anim = ActivityOptionsCompat.makeCustomAnimation(context, R.anim.slide_up, R.anim.slide_down)
38-
startActivity(context.intentFor<NewArenaActivity>(), anim.toBundle())
39+
ActivityCompat.startActivity(activity, context.intentFor<NewArenaActivity>(), anim.toBundle())
3940
}
4041
MetricsManager.trackScreen(MetricScreen.SCREEN_ARENA())
4142
}

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/arena/widget/ArenaDraftCards.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class ArenaDraftCards(ctx: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
149149

150150
private fun updateCardList(cards: List<Card>, cardsAdapter: CardsAllFragment.CardsAllAdapter) {
151151
cardsAdapter.showCards(cards.filter { it.attr == currentAttr }
152-
.filter { currentMagika == -1 || it.cost == currentMagika }
152+
.filter { currentMagika == -1 || (if (currentMagika < 7) it.cost == currentMagika else it.cost >= currentMagika) }
153153
.filter { currentRarity == null || it.rarity == currentRarity }
154154
.filter { !it.evolves }
155155
.sortedBy { it.cost })

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ class CardsCollectionFragment : CardsAllFragment() {
5858

5959
var isEditStarted: Boolean = false
6060

61-
val view_statistics by lazy { activity.find<CollectionStatistics>(R.id.cards_collection_statistics) }
61+
val view_statistics: CollectionStatistics
62+
get() = activity.find<CollectionStatistics>(R.id.cards_collection_statistics)
63+
6264
val statisticsSheetBehavior: BottomSheetBehavior<CollectionStatistics>
6365
get() = BottomSheetBehavior.from(view_statistics)
6466

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/decks/tabs/DecksPublicFragment.kt‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.ediposouza.teslesgendstracker.ui.decks.tabs
22

3+
import android.os.Build
34
import android.os.Bundle
5+
import android.support.v4.app.ActivityCompat
46
import android.support.v4.app.ActivityOptionsCompat
57
import android.support.v4.util.Pair
68
import android.support.v7.widget.LinearLayoutManager
@@ -20,6 +22,7 @@ import com.ediposouza.teslesgendstracker.ui.base.*
2022
import com.ediposouza.teslesgendstracker.ui.cards.CmdFilterSearch
2123
import com.ediposouza.teslesgendstracker.ui.decks.DeckActivity
2224
import com.ediposouza.teslesgendstracker.ui.util.firebase.OnLinearLayoutItemScrolled
25+
import com.ediposouza.teslesgendstracker.util.ConfigManager
2326
import com.ediposouza.teslesgendstracker.util.inflate
2427
import com.google.firebase.auth.FirebaseAuth
2528
import jp.wasabeef.recyclerview.animators.SlideInLeftAnimator
@@ -35,6 +38,7 @@ import java.text.NumberFormat
3538
*/
3639
open class DecksPublicFragment : BaseFragment() {
3740

41+
val ASUS_CREATE_LAYER_ERROR = "Z00AD"
3842
val ADS_EACH_ITEMS = 10 //after 10 lines
3943
val DECK_PAGE_SIZE = 8
4044

@@ -62,12 +66,18 @@ open class DecksPublicFragment : BaseFragment() {
6266
val favorite = it?.filter { it.uuid == deck.uuid }?.isNotEmpty() ?: false
6367
val userId = FirebaseAuth.getInstance().currentUser?.uid
6468
val like = deck.likes.contains(userId)
65-
startActivity(DeckActivity.newIntent(context, deck, favorite, like, deck.owner == userId),
66-
ActivityOptionsCompat.makeSceneTransitionAnimation(activity,
67-
Pair(view.deck_name as View, nameTransitionName),
68-
Pair(view.deck_cover as View, coverTransitionName),
69-
Pair(view.deck_attr1 as View, attr1TransitionName),
70-
Pair(view.deck_attr2 as View, attr2TransitionName)).toBundle())
69+
val deckIntent = DeckActivity.newIntent(context, deck, favorite, like, deck.owner == userId)
70+
if (ConfigManager.isAsusZenPhoneSingleAnim() && Build.MODEL.contains(ASUS_CREATE_LAYER_ERROR)) {
71+
ActivityCompat.startActivity(activity, deckIntent, ActivityOptionsCompat
72+
.makeSceneTransitionAnimation(activity, view.deck_cover, coverTransitionName).toBundle())
73+
} else {
74+
ActivityCompat.startActivity(activity, deckIntent, ActivityOptionsCompat
75+
.makeSceneTransitionAnimation(activity,
76+
Pair(view.deck_name as View, nameTransitionName),
77+
Pair(view.deck_cover as View, coverTransitionName),
78+
Pair(view.deck_attr1 as View, attr1TransitionName),
79+
Pair(view.deck_attr2 as View, attr2TransitionName)).toBundle())
80+
}
7181
}
7282
}
7383

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/decks/widget/DeckList.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,17 @@ class DeckList(ctx: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
4141
}
4242
var editMode = false
4343

44-
private fun showExpandedCard(card: Card, view: View) {
45-
val transitionName = context.getString(R.string.card_transition_name)
46-
ActivityCompat.startActivity(context, CardActivity.newIntent(context, card),
47-
ActivityOptionsCompat.makeSceneTransitionAnimation(context as Activity, view, transitionName).toBundle())
48-
}
44+
val cardTransitionName by lazy { context.getString(R.string.card_transition_name) }
4945

5046
val deckListAdapter by lazy {
5147
DeckListAdapter({ index -> decklist_recycle_view.scrollToPosition(index) },
5248
itemClick = { view, card ->
5349
if (editMode) {
5450
remCard(card)
5551
} else {
56-
showExpandedCard(card, view)
52+
ActivityCompat.startActivity(context, CardActivity.newIntent(context, card),
53+
ActivityOptionsCompat.makeSceneTransitionAnimation(context as Activity,
54+
view, cardTransitionName).toBundle())
5755
}
5856
},
5957
itemLongClick = { view, card ->
@@ -63,7 +61,9 @@ class DeckList(ctx: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
6361
negativeButton(android.R.string.no, {})
6462
}.show()
6563
} else {
66-
showExpandedCard(card, view)
64+
ActivityCompat.startActivity(context, CardActivity.newIntent(context, card),
65+
ActivityOptionsCompat.makeSceneTransitionAnimation(context as Activity,
66+
view, cardTransitionName).toBundle())
6767
}
6868
true
6969
})

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/matches/tabs/MatchesStatisticsFragment.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.ediposouza.teslesgendstracker.ui.matches.tabs
22

33
import android.content.Context
44
import android.os.Bundle
5+
import android.support.v4.app.ActivityCompat
56
import android.support.v4.app.ActivityOptionsCompat
67
import android.support.v4.content.ContextCompat
78
import android.support.v4.util.Pair
@@ -93,7 +94,7 @@ class MatchesStatisticsFragment : BaseFragment() {
9394
it.getTag(com.inqbarna.tablefixheaders.R.id.tag_row) == row &&
9495
it.getTag(com.inqbarna.tablefixheaders.R.id.tag_type_view) == 2
9596
}.first()
96-
startActivity(MatchesStatisticsClassActivity.newIntent(context, currentMatchMode, currentSeason,
97+
ActivityCompat.startActivity(activity, MatchesStatisticsClassActivity.newIntent(context, currentMatchMode, currentSeason,
9798
selectedClass!!), ActivityOptionsCompat.makeSceneTransitionAnimation(activity,
9899
Pair(classView.cell_class_attr1 as View, attr1TransitionName),
99100
Pair(classView.cell_class_attr2 as View, attr2TransitionName)).toBundle())

‎app/src/main/kotlin/com/ediposouza/teslesgendstracker/util/ConfigManager.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ object ConfigManager {
1414
val DB_UPDATE_CONFIG = "db_update"
1515
val SHOW_DECK_ADS_CONFIG = "showDeckAds"
1616
val VERSION_UNSUPPORTED_CONFIG = "version_unsupported"
17+
val ASUS_ZENPHONE_SINGLE_ANIM_CONFIG = "asusZenPhoneSingleAnim"
1718

1819
val remoteConfig: FirebaseRemoteConfig by lazy { FirebaseRemoteConfig.getInstance() }
1920

@@ -24,7 +25,8 @@ object ConfigManager {
2425
.build())
2526
setDefaults(mapOf(DB_UPDATE_CONFIG to false,
2627
SHOW_DECK_ADS_CONFIG to false,
27-
VERSION_UNSUPPORTED_CONFIG to ""))
28+
VERSION_UNSUPPORTED_CONFIG to "",
29+
ASUS_ZENPHONE_SINGLE_ANIM_CONFIG to false))
2830
}
2931
updateCaches {}
3032
}
@@ -44,6 +46,8 @@ object ConfigManager {
4446

4547
fun isShowDeckAds() = remoteConfig.getBoolean(SHOW_DECK_ADS_CONFIG)
4648

49+
fun isAsusZenPhoneSingleAnim() = remoteConfig.getBoolean(ASUS_ZENPHONE_SINGLE_ANIM_CONFIG)
50+
4751
fun isVersionUnsupported(): Boolean {
4852
val unsupportedVersions = remoteConfig.getString(VERSION_UNSUPPORTED_CONFIG)
4953
if (unsupportedVersions.isEmpty()) {

0 commit comments

Comments
 (0)