From 9fabc288ec23ff2e2f0a21f0c8ac6d2c94b0bcc6 Mon Sep 17 00:00:00 2001
From: Baldissera <guilhermebaldissera@hotmail.com>
Date: Mon, 2 Jul 2018 01:53:55 -0300
Subject: [PATCH] Adjust conflicts of build fase

---
 mkdocs.yml                                             |  2 +-
 .../nexte/PlayersListScene/PlayersListFragment.kt      |  6 ------
 .../src/main/res/layout/activity_challenger_sent.xml   | 10 ++--------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index f7252f22..44e6527b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -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
diff --git a/project/app/src/main/java/com/nexte/nexte/PlayersListScene/PlayersListFragment.kt b/project/app/src/main/java/com/nexte/nexte/PlayersListScene/PlayersListFragment.kt
index 0fbe0e09..4eaa5026 100644
--- a/project/app/src/main/java/com/nexte/nexte/PlayersListScene/PlayersListFragment.kt
+++ b/project/app/src/main/java/com/nexte/nexte/PlayersListScene/PlayersListFragment.kt
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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
diff --git a/project/app/src/main/res/layout/activity_challenger_sent.xml b/project/app/src/main/res/layout/activity_challenger_sent.xml
index 5767f29e..173fc3da 100644
--- a/project/app/src/main/res/layout/activity_challenger_sent.xml
+++ b/project/app/src/main/res/layout/activity_challenger_sent.xml
@@ -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>
 
@@ -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"
@@ -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"