Skip to content

Commit

Permalink
Merge pull request #500 from fga-gpp-mds/hotfix/1.8
Browse files Browse the repository at this point in the history
Hotfix/1.8
  • Loading branch information
luis-gustavo authored Jul 2, 2018
2 parents f7b3e29 + 9fabc28 commit 94b9be5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ pages:
- Testes de Usabilidade: Testes/TestesUsabilidade.md
- Post Mortem:
- Post Mortem - Release 1: PostMortem/PostMortemRelease1.md
- Post Mortem Release 2 + Fechamento do Projeto: PostMortemRelease2-FechamentoDoProjeto.md
- Post Mortem Release 2 + Fechamento do Projeto: PostMortem/PostMortemRelease2-FechamentoDoProjeto.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ interface PlayersListDisplayLogic {
* @property userManager is the [UserManager] object that will be passed to the worker
* @property fragment is the parent fragment instance that will be used to update tabs when user send challenge
* @property sendChallengeButton is the instance of the button responsible to send the challenge
* @property expandedLosses is the instance of field that will hold player losses when expanded view is visible
* @property expandedWins is the instance of field that will hold player wins when expanded view is visible
* @property expandedRankingTextView is the instance of field that will hold player ranking position when expanded view is visible]
* @property expandedName is the instance of field that will hold player username when expanded view is visible
Expand All @@ -81,7 +80,6 @@ class PlayersListFragment : Fragment(), PlayersListDisplayLogic {
var userManager: UserManager? = null
var fragment: Fragment?= null
var sendChallengeButton: Button?= null
var expandedLosses: TextView?= null
var expandedWins: TextView?= null
var expandedRankingTextView: TextView?= null
var expandedName: TextView?= null
Expand Down Expand Up @@ -166,7 +164,6 @@ class PlayersListFragment : Fragment(), PlayersListDisplayLogic {

this.sendChallengeButton = newView?.findViewById(R.id.sendChallengeButton)
this.recyclerView = newView?.findViewById(R.id.challengeRecyclerView)
this.expandedLosses = newView?.findViewById(R.id.expandedLosses)
this.expandedName = newView?.findViewById(R.id.expandedName)
this.expandedWins = newView?.findViewById(R.id.expandedWins)
this.noPlayersText = newView?.findViewById(R.id.noPlayersText)
Expand Down Expand Up @@ -239,7 +236,6 @@ class PlayersListFragment : Fragment(), PlayersListDisplayLogic {

val currentPlayer = viewModel.challengedRankingDetails

this.expandedLosses?.visibility = View.VISIBLE
this.expandedName?.visibility = View.VISIBLE
this.expandedName?.text = currentPlayer.name
this.expandedRankingTextView?.visibility = View.VISIBLE
Expand Down Expand Up @@ -331,8 +327,6 @@ class PlayersListFragment : Fragment(), PlayersListDisplayLogic {
fun removePlayerDetailedInfo() {

this.selectedUserIdentifier = null
this.expandedLosses?.visibility = View.INVISIBLE
this.expandedLosses?.text = ""
this.expandedName?.visibility = View.INVISIBLE
this.expandedName?.text = ""
this.expandedRankingTextView?.visibility = View.INVISIBLE
Expand Down
10 changes: 2 additions & 8 deletions project/app/src/main/res/layout/activity_challenger_sent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/challengeRecyclerView"
app:layout_constraintVertical_bias="0.0">
app:layout_constraintVertical_bias="0.0"
android:orientation="horizontal">

</LinearLayout>

Expand All @@ -53,12 +54,8 @@
android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:textColor="@android:color/background_light"
android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@+id/expandedLosses"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--app:layout_constraintStart_toEndOf="@+id/expandedRankingTextView"-->
<!--app:layout_constraintTop_toTopOf="@+id/expandedRankingTextView" -->


<TextView
android:id="@+id/expandedCategory"
Expand Down Expand Up @@ -136,9 +133,6 @@
app:layout_constraintEnd_toStartOf="@+id/circulo1"
app:layout_constraintStart_toEndOf="@+id/circulo4"
app:layout_constraintTop_toTopOf="@+id/expandedName" />
<!--app:layout_constraintEnd_toStartOf="@+id/circulo3"-->

<!--app:layout_constraintEnd_toStartOf="@+id/circulo4"-->

<ImageView
android:id="@+id/circulo3"
Expand Down

0 comments on commit 94b9be5

Please sign in to comment.