diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index 9c7ed8a..84bfaf7 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -14,14 +14,17 @@ android:supportsRtl="true" android:theme="@style/Theme.Scor_It" tools:targetApi="31"> + + - diff --git a/src/app/src/main/java/uca/iut/clermont/model/Competition.kt b/src/app/src/main/java/uca/iut/clermont/model/Competition.kt index e9ec94c..81eda26 100644 --- a/src/app/src/main/java/uca/iut/clermont/model/Competition.kt +++ b/src/app/src/main/java/uca/iut/clermont/model/Competition.kt @@ -6,7 +6,7 @@ class Competition( val code: String, val type: String, val emblem: String, - val currentSeason: season, + val currentSeason: Season, val area: Area ) { } \ No newline at end of file diff --git a/src/app/src/main/java/uca/iut/clermont/model/season.kt b/src/app/src/main/java/uca/iut/clermont/model/Season.kt similarity index 92% rename from src/app/src/main/java/uca/iut/clermont/model/season.kt rename to src/app/src/main/java/uca/iut/clermont/model/Season.kt index 5f15469..e991765 100644 --- a/src/app/src/main/java/uca/iut/clermont/model/season.kt +++ b/src/app/src/main/java/uca/iut/clermont/model/Season.kt @@ -2,7 +2,7 @@ package uca.iut.clermont.model import java.util.Date -class season( +class Season( val id: Int, val startDate: Date, val endDate: Date, diff --git a/src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt b/src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt new file mode 100644 index 0000000..bcb932a --- /dev/null +++ b/src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt @@ -0,0 +1,11 @@ +package uca.iut.clermont.view + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle + +class FavoriteActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_favorite) + } +} \ No newline at end of file diff --git a/src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt b/src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt index 43ed7d4..c21e90d 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt @@ -1,7 +1,6 @@ package uca.iut.clermont.view import android.app.Activity -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import uca.iut.clermont.R diff --git a/src/app/src/main/res/drawable/arrow.png b/src/app/src/main/res/drawable/arrow.png new file mode 100644 index 0000000..01c6e3a Binary files /dev/null and b/src/app/src/main/res/drawable/arrow.png differ diff --git a/src/app/src/main/res/drawable/border_rounded.xml b/src/app/src/main/res/drawable/border_rounded.xml new file mode 100644 index 0000000..933b33e --- /dev/null +++ b/src/app/src/main/res/drawable/border_rounded.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/res/layout/activity_favorite.xml b/src/app/src/main/res/layout/activity_favorite.xml new file mode 100644 index 0000000..34555bb --- /dev/null +++ b/src/app/src/main/res/layout/activity_favorite.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/res/xml/data_extraction_rules.xml b/src/app/src/main/res/xml/data_extraction_rules.xml index 9ee9997..6432037 100644 --- a/src/app/src/main/res/xml/data_extraction_rules.xml +++ b/src/app/src/main/res/xml/data_extraction_rules.xml @@ -1,19 +1,8 @@ - + + - + - + \ No newline at end of file diff --git a/src/app/src/test/java/uca/iut/clermont/ExampleUnitTest.kt b/src/app/src/test/java/uca/iut/clermont/ExampleUnitTest.kt index 65dcbd1..cc739e0 100644 --- a/src/app/src/test/java/uca/iut/clermont/ExampleUnitTest.kt +++ b/src/app/src/test/java/uca/iut/clermont/ExampleUnitTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.* */ class ExampleUnitTest { @Test - fun addition_isCorrect() { + fun additionIsCorrect() { assertEquals(4, 2 + 2) } } \ No newline at end of file