emre.kartal
/
Scor_It
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

realization of the recycler view for the matches ✅
continuous-integration/drone/push Build is passing Details

Browse Source
Stub_RecycleViewV2
Emre KARTAL 2 years ago
parent a2f68affb7
commit 6672ec4664
15 changed files with 604 additions and 126 deletions
Show Stats Download Patch File Download Diff File

346
src/.idea/shelf/Uncommitted_changes_before_Update_at_21_03_2023_09_05_[Changes]/shelved.patch
View File

File diff suppressed because one or more lines are too long

4
src/.idea/shelf/Uncommitted_changes_before_Update_at_21_03_2023_09_05__Changes_.xml
Unescape View File

@ -0,0 +1,4 @@
<changelist name="Uncommitted_changes_before_Update_at_21_03_2023_09_05_[Changes]" date="1679385937643" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21_03_2023_09_05_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 21/03/2023 09:05 [Changes]" />
</changelist>

192
src/app/src/main/java/uca/iut/clermont/data/StubData.kt
Unescape View File

@ -12,7 +12,7 @@ import java.util.*
class StubData : DataManager() {
override val areaMgr: AreaManager = StubAreaManager(this)
override val peopleMgr: PeopleManager = StubPeopleManager(this)
override val matchesMgr: MatchesManager = StubMatchesManager()
override val matchesMgr: MatchesManager = StubMatchesManager(this)
override val competitionsMgr: CompetitionsManager = StubCompetitionsManager()
override val teamsMgr: TeamsManager = StubTeamsManager(this)
@ -36,9 +36,11 @@ class StubData : DataManager() {
"Lionel",
"Messi",
"L. Messi",
Calendar.getInstance().apply { set(1987, 6, 24)},
Calendar.getInstance().apply { set(1987, 6, 24) },
"Argentina",
Contract(Calendar.getInstance().apply { set(2020, 6, 1)}, Calendar.getInstance().apply { set(2025, 6, 1)}),
Contract(
Calendar.getInstance().apply { set(2020, 6, 1) },
Calendar.getInstance().apply { set(2025, 6, 1) }),
"Forward",
10
),
@ -47,9 +49,11 @@ class StubData : DataManager() {
"Cristiano",
"Ronaldo",
"C. Ronaldo",
Calendar.getInstance().apply { set(1985, 2, 5)},
Calendar.getInstance().apply { set(1985, 2, 5) },
"Portugal",
Contract(Calendar.getInstance().apply { set(2020, 7, 1)}, Calendar.getInstance().apply { set(2024, 7, 1)}),
Contract(
Calendar.getInstance().apply { set(2020, 7, 1) },
Calendar.getInstance().apply { set(2024, 7, 1) }),
"Forward",
7
),
@ -58,9 +62,11 @@ class StubData : DataManager() {
"Neymar",
"Jr",
"Neymar",
Calendar.getInstance().apply { set(1992, 2, 5)},
Calendar.getInstance().apply { set(1992, 2, 5) },
"Brazil",
Contract(Calendar.getInstance().apply { set(2021, 1, 1)}, Calendar.getInstance().apply { set(2026, 1, 1)}),
Contract(
Calendar.getInstance().apply { set(2021, 1, 1) },
Calendar.getInstance().apply { set(2026, 1, 1) }),
"Forward",
10
),
@ -69,9 +75,11 @@ class StubData : DataManager() {
"Kylian",
"Mbappe",
"K. Mbappe",
Calendar.getInstance().apply { set(1998, 12, 20)},
Calendar.getInstance().apply { set(1998, 12, 20) },
"France",
Contract(Calendar.getInstance().apply { set(2022, 1, 1)}, Calendar.getInstance().apply { set(2027, 1, 1)}),
Contract(
Calendar.getInstance().apply { set(2022, 1, 1) },
Calendar.getInstance().apply { set(2027, 1, 1) }),
"Forward",
7
),
@ -80,9 +88,11 @@ class StubData : DataManager() {
"Mohamed",
"Salah",
"M. Salah",
Calendar.getInstance().apply { set(1992, 6, 15)},
Calendar.getInstance().apply { set(1992, 6, 15) },
"Egypt",
Contract(Calendar.getInstance().apply { set(2021, 7, 1)}, Calendar.getInstance().apply { set(2025, 7, 1)}),
Contract(
Calendar.getInstance().apply { set(2021, 7, 1) },
Calendar.getInstance().apply { set(2025, 7, 1) }),
"Forward",
11
),
@ -91,9 +101,11 @@ class StubData : DataManager() {
"Kevin",
"De Bruyne",
"K. De Bruyne",
Calendar.getInstance().apply { set(1991, 6, 28)},
Calendar.getInstance().apply { set(1991, 6, 28) },
"Belgium",
Contract(Calendar.getInstance().apply { set(2021, 8, 1)}, Calendar.getInstance().apply { set(2026, 8, 1)}),
Contract(
Calendar.getInstance().apply { set(2021, 8, 1) },
Calendar.getInstance().apply { set(2026, 8, 1) }),
"Midfielder",
17
),
@ -102,9 +114,11 @@ class StubData : DataManager() {
"Robert",
"Lewandowski",
"R. Lewandowski",
Calendar.getInstance().apply { set(1988, 8, 21)},
Calendar.getInstance().apply { set(1988, 8, 21) },
"Poland",
Contract(Calendar.getInstance().apply { set(2021, 1, 1)}, Calendar.getInstance().apply { set(2024, 1, 1)}),
Contract(
Calendar.getInstance().apply { set(2021, 1, 1) },
Calendar.getInstance().apply { set(2024, 1, 1) }),
"Forward",
9
),
@ -113,9 +127,11 @@ class StubData : DataManager() {
"Sadio",
"Mane",
"S. Mane",
Calendar.getInstance().apply { set(1992, 4, 10)},
Calendar.getInstance().apply { set(1992, 4, 10) },
"Senegal",
Contract(Calendar.getInstance().apply { set(2022, 1, 1)}, Calendar.getInstance().apply { set(2026, 1, 1)}),
Contract(
Calendar.getInstance().apply { set(2022, 1, 1) },
Calendar.getInstance().apply { set(2026, 1, 1) }),
"Forward",
10
),
@ -124,9 +140,11 @@ class StubData : DataManager() {
"Virgil",
"Van Dijk",
"V. Van Dijk",
Calendar.getInstance().apply { set(1991, 7, 8)},
Calendar.getInstance().apply { set(1991, 7, 8) },
"Netherlands",
Contract(Calendar.getInstance().apply { set(2023, 1, 1)}, Calendar.getInstance().apply { set(2026, 1, 1)}),
Contract(
Calendar.getInstance().apply { set(2023, 1, 1) },
Calendar.getInstance().apply { set(2026, 1, 1) }),
"Defender",
4
),
@ -135,9 +153,11 @@ class StubData : DataManager() {
"Luka",
"Modric",
"L. Modric",
Calendar.getInstance().apply { set(1985, 9, 9)},
Calendar.getInstance().apply { set(1985, 9, 9) },
"Croatia",
Contract(Calendar.getInstance().apply { set(2020, 6, 1)}, Calendar.getInstance().apply { set(2022, 6, 1)}),
Contract(
Calendar.getInstance().apply { set(2020, 6, 1) },
Calendar.getInstance().apply { set(2022, 6, 1) }),
"Midfielder",
10
),
@ -146,9 +166,11 @@ class StubData : DataManager() {
"Harry",
"Kane",
"H. Kane",
Calendar.getInstance().apply { set(1993, 7, 28)},
Calendar.getInstance().apply { set(1993, 7, 28) },
"England",
Contract(Calendar.getInstance().apply { set(2021, 7, 1)}, Calendar.getInstance().apply { set(2025, 7, 1)}),
Contract(
Calendar.getInstance().apply { set(2021, 7, 1) },
Calendar.getInstance().apply { set(2025, 7, 1) }),
"Forward",
10
),
@ -157,9 +179,11 @@ class StubData : DataManager() {
"Sergio",
"Aguero",
"S. Aguero",
Calendar.getInstance().apply { set(1988, 6, 2)},
Calendar.getInstance().apply { set(1988, 6, 2) },
"Argentina",
Contract(Calendar.getInstance().apply { set(2021, 6, 1)}, Calendar.getInstance().apply { set(2023, 6, 1)}),
Contract(
Calendar.getInstance().apply { set(2021, 6, 1) },
Calendar.getInstance().apply { set(2023, 6, 1) }),
"Forward",
10
),
@ -168,9 +192,11 @@ class StubData : DataManager() {
"Eden",
"Hazard",
"E. Hazard",
Calendar.getInstance().apply { set(1991, 1, 7)},
Calendar.getInstance().apply { set(1991, 1, 7) },
"Belgium",
Contract(Calendar.getInstance().apply { set(2022, 1, 1)}, Calendar.getInstance().apply { set(2027, 1, 1)}),
Contract(
Calendar.getInstance().apply { set(2022, 1, 1) },
Calendar.getInstance().apply { set(2027, 1, 1) }),
"Forward",
7
),
@ -179,39 +205,103 @@ class StubData : DataManager() {
"Pep",
"Guardiola",
"P. Guardiola",
Calendar.getInstance().apply { set(1971, 1, 18)},
Calendar.getInstance().apply { set(1971, 1, 18) },
"Spain",
Contract(Calendar.getInstance().apply { set(2020, 6, 1)}, Calendar.getInstance().apply { set(2023, 6, 1)})
Contract(
Calendar.getInstance().apply { set(2020, 6, 1) },
Calendar.getInstance().apply { set(2023, 6, 1) })
),
Coach(
15,
"Jurgen",
"Klopp",
"J. Klopp",
Calendar.getInstance().apply { set(1967, 6, 16)},
Calendar.getInstance().apply { set(1967, 6, 16) },
"Germany",
Contract(Calendar.getInstance().apply { set(2020, 7, 1)}, Calendar.getInstance().apply { set(2024, 7, 1)})
Contract(
Calendar.getInstance().apply { set(2020, 7, 1) },
Calendar.getInstance().apply { set(2024, 7, 1) })
),
Staff(
16,
"Jorge",
"Desio",
"J. Desio",
Calendar.getInstance().apply { set(1966, 1, 1)},
Calendar.getInstance().apply { set(1966, 1, 1) },
"Argentina",
Contract(Calendar.getInstance().apply { set(2020, 6, 1)}, Calendar.getInstance().apply { set(2023, 6, 1)})
Contract(
Calendar.getInstance().apply { set(2020, 6, 1) },
Calendar.getInstance().apply { set(2023, 6, 1) })
),
Staff(
17,
"Craig",
"Mawson",
"C. Mawson",
Calendar.getInstance().apply { set(1973, 8, 22)},
Calendar.getInstance().apply { set(1973, 8, 22) },
"England",
Contract(Calendar.getInstance().apply { set(2020, 7, 1)}, Calendar.getInstance().apply { set(2024, 7, 1)})
Contract(
Calendar.getInstance().apply { set(2020, 7, 1) },
Calendar.getInstance().apply { set(2024, 7, 1) })
)
)
private val teamList = listOf(
private val random = java.util.Random()
val matchList = listOf(
Match(
1,
1,
2,
Calendar.getInstance().apply { set(2022, random.nextInt(12), random.nextInt(28) + 1) },
"FINISHED",
Score(1, 1, "DRAW")
),
Match(
2,
3,
1,
Calendar.getInstance().apply { set(2022, random.nextInt(12), random.nextInt(28) + 1) },
"FINISHED",
Score(2, 0, "HOME_TEAM")
),
Match(
3,
2,
3,
Calendar.getInstance().apply { set(2022, random.nextInt(12), random.nextInt(28) + 1) },
"FINISHED",
Score(0, 4, "AWAY_TEAM")
),
Match(
4,
1,
3,
Calendar.getInstance().apply { set(2023, random.nextInt(12), random.nextInt(28) + 1) },
"FINISHED",
Score(0, 1, "AWAY_TEAM")
),
Match(
5,
2,
1,
Calendar.getInstance().apply { set(2023, random.nextInt(12), random.nextInt(28) + 1) },
"FINISHED",
Score(0, 0, "DRAW")
),
Match(
6,
3,
2,
Calendar.getInstance().apply { set(2023, random.nextInt(12), random.nextInt(28) + 1) },
"FINISHED",
Score(2, 0, "HOME_TEAM")
)
)
val teamList: MutableList<Team> = mutableListOf()
fun initTeams() {
teamList.add(
Team(
1,
"Paris Saint-Germain FC",
@ -226,7 +316,9 @@ class StubData : DataManager() {
peopleList[0] as Coach,
listOf(peopleList[2] as Staff),
listOf(peopleList[0] as Player, peopleList[3] as Player, peopleList[11] as Player)
),
)
)
teamList.add(
Team(
2,
"FC Barcelona",
@ -241,7 +333,9 @@ class StubData : DataManager() {
peopleList[0] as Coach,
listOf(peopleList[2] as Staff),
listOf(peopleList[0] as Player, peopleList[5] as Player, peopleList[9] as Player)
),
)
)
teamList.add(
Team(
3,
"Liverpool FC",
@ -258,6 +352,7 @@ class StubData : DataManager() {
listOf(peopleList[7] as Player, peopleList[8] as Player, peopleList[10] as Player)
)
)
}
class StubAreaManager(private val parent: StubData) : AreaManager {
@ -279,32 +374,27 @@ class StubData : DataManager() {
override fun getItemById(id: Int) = parent.peopleList.find { it.id == id }
}
class StubMatchesManager : MatchesManager {
override fun getItemsByName(substring: String): List<Match> {
TODO("Not yet implemented")
}
class StubMatchesManager(private val parent: StubData) : MatchesManager {
override fun getItemsByName(substring: String) =
throw java.lang.Exception("Don't call this function")
override fun getItems(): List<Match> {
TODO("Not yet implemented")
}
override fun getItems(): List<Match> = parent.matchList
override fun getItemById(id: Int): Match? {
TODO("Not yet implemented")
}
override fun getItemById(id: Int) = parent.matchList.find { it.id == id }
}
class StubCompetitionsManager : CompetitionsManager {
override fun getItemsByName(substring: String): List<Competition> {
TODO("Not yet implemented")
throw java.lang.Exception("Don't call this function")
}
override fun getItems(): List<Competition> {
TODO("Not yet implemented")
throw java.lang.Exception("Don't call this function")
}
override fun getItemById(id: Int): Competition? {
TODO("Not yet implemented")
throw java.lang.Exception("Don't call this function")
}
}

2
src/app/src/main/java/uca/iut/clermont/model/ApiManager.kt
Unescape View File

@ -7,7 +7,7 @@ import MatchesManager
import PeopleManager
import TeamsManager
class StubData : DataManager() {
class ApiManager : DataManager() {
override val areaMgr: AreaManager = ApiAreaManager()
override val peopleMgr: PeopleManager = ApiPeopleManager()
override val matchesMgr: MatchesManager = ApiMatchesManager()

1
src/app/src/main/java/uca/iut/clermont/model/DataManager.kt
Unescape View File

@ -6,6 +6,7 @@ abstract class DataManager {
abstract val matchesMgr: MatchesManager
abstract val competitionsMgr: CompetitionsManager
abstract val teamsMgr: TeamsManager
}
interface AreaManager : GenericDataManager<Area>

8
src/app/src/main/java/uca/iut/clermont/model/Match.kt
Unescape View File

@ -1,10 +1,12 @@
package uca.iut.clermont.model
import java.util.Calendar
class Match(
val id: Int,
val idHomeTeam: Int,
val idAwayTeam: Int,
val date: Calendar,
val status: String,
val winner: String
) {
}
val score: Score
)

1
src/app/src/main/java/uca/iut/clermont/model/Personne.kt
Unescape View File

@ -1,7 +1,6 @@
package uca.iut.clermont.model
import java.util.Calendar
import java.util.Date
abstract class Personne(
val id: Int,

7
src/app/src/main/java/uca/iut/clermont/model/Score.kt
Unescape View File

@ -0,0 +1,7 @@
package uca.iut.clermont.model
class Score(
val home: Int,
val away: Int,
val winner: String
)

1
src/app/src/main/java/uca/iut/clermont/model/Staff.kt
Unescape View File

@ -1,7 +1,6 @@
package uca.iut.clermont.model
import java.util.Calendar
import java.util.Date
class Staff(
id: Int,

4
src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt
Unescape View File

@ -1,10 +1,10 @@
package uca.iut.clermont.view
import androidx.appcompat.app.AppCompatActivity
import android.app.Activity
import android.os.Bundle
import uca.iut.clermont.R
class FavoriteActivity : AppCompatActivity() {
class FavoriteActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_favorite)

14
src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt
Unescape View File

@ -3,15 +3,29 @@ package uca.iut.clermont.view
import android.app.Activity
import android.os.Bundle
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import uca.iut.clermont.R
import uca.iut.clermont.data.StubData
import uca.iut.clermont.view.adapter.MatchesAdapter
import java.util.*
class HomeActivity : Activity() {
private var manager = StubData()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_home)
val imageFirstTeam = findViewById<ImageView>(R.id.ImageFirstTeam)
/*val adapterMatches = findViewById<RecyclerView>(R.id.ListRecentsMatches)
with(adapterMatches) {
adapter = MatchesAdapter(manager.matchesMgr.getItems())
}*/
Glide.with(this)
.load("https://crests.football-data.org/1765.svg")
.error(R.drawable.imagenotfound)

21
src/app/src/main/java/uca/iut/clermont/view/adapter/MatchesAdapter.kt
Unescape View File

@ -0,0 +1,21 @@
package uca.iut.clermont.view.adapter
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import uca.iut.clermont.R
import uca.iut.clermont.model.Match
import uca.iut.clermont.view.viewHolder.MatchHolder
class MatchesAdapter(val recentMatches: List<Match>) : RecyclerView.Adapter<MatchHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MatchHolder {
return MatchHolder(LayoutInflater.from(parent.context).inflate(R.layout.cellule_match, parent, false))
}
override fun onBindViewHolder(holder: MatchHolder, position: Int) {
holder.textView.text = recentMatches[position].toString()
}
override fun getItemCount() = recentMatches.size
}

17
src/app/src/main/java/uca/iut/clermont/view/viewHolder/MatchHolder.kt
Unescape View File

@ -0,0 +1,17 @@
package uca.iut.clermont.view.viewHolder
import android.view.View
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import uca.iut.clermont.R
class MatchHolder(view: View) : RecyclerView.ViewHolder(view) {
val textView: TextView
init {
// Define click listener for the ViewHolder's View
textView = view.findViewById(R.id.TitleFirstTeam)
}
}

29
src/app/src/main/res/layout/activity_favorite.xml
Unescape View File

@ -45,35 +45,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exitContainer" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/border_rounded"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textFavorites">
<ImageView
android:id="@+id/imageFavorites"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/mulish_bold"
android:maxLines="3"
android:text="Campeonato Brasileiro Série A"
android:textColor="@color/black"
android:textSize="18dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

9
src/app/src/main/res/layout/activity_home.xml
Unescape View File

@ -31,7 +31,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textViewTitle" />
<LinearLayout
android:id="@+id/searchBarContainer"
android:layout_width="0dp"
@ -194,4 +193,12 @@
android:background="#E1DFDF" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/ListRecentsMatches"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/CardContainer" />
</androidx.constraintlayout.widget.ConstraintLayout>
Write Preview
Loading…
Cancel
Save