From 170d64bcc4f6cbe16275b3c56d1f27b611088853 Mon Sep 17 00:00:00 2001
From: Emre <Emre.kartal@etu.uca.fr>
Date: Mon, 13 Mar 2023 22:16:48 +0100
Subject: [PATCH] Create a FavoritePage and correct code smell :sparkles:

---
 src/app/src/main/AndroidManifest.xml          |   5 +-
 .../uca/iut/clermont/model/Competition.kt     |   2 +-
 .../clermont/model/{season.kt => Season.kt}   |   2 +-
 .../uca/iut/clermont/view/FavoriteActivity.kt |  11 +++
 .../uca/iut/clermont/view/HomeActivity.kt     |   1 -
 src/app/src/main/res/drawable/arrow.png       | Bin 0 -> 588 bytes
 .../src/main/res/drawable/border_rounded.xml  |  13 +++
 .../src/main/res/layout/activity_favorite.xml |  79 ++++++++++++++++++
 .../main/res/xml/data_extraction_rules.xml    |  19 +----
 .../java/uca/iut/clermont/ExampleUnitTest.kt  |   2 +-
 10 files changed, 114 insertions(+), 20 deletions(-)
 rename src/app/src/main/java/uca/iut/clermont/model/{season.kt => Season.kt} (92%)
 create mode 100644 src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt
 create mode 100644 src/app/src/main/res/drawable/arrow.png
 create mode 100644 src/app/src/main/res/drawable/border_rounded.xml
 create mode 100644 src/app/src/main/res/layout/activity_favorite.xml

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">
+        <activity
+            android:name=".FavoriteActivity"
+            android:exported="false" />
         <activity
             android:name=".view.HomeActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
     </application>
 
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 0000000000000000000000000000000000000000..01c6e3aa16e8ae46706a702fc463bb6015c250bc
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000sI000{Z1^@s6alzl800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0pUqRK~#7FomIP1
z!ax+=JYZ5{XT|UuYD&vxcno&f*@<7Eeu4N0SXv=ppmxY(43#C=1Cu{6Jp*`d#yHC+
zW)sd#W;bUyhqHU`E*d)mjYgxQY1+$vzt5n39F0a@jU@y`I%xVLx7ln?bd~_kX0t1c
z_%K;~Cp|3XM&`kFZQFL0OXHkp(&=;`AGGDM-EP;JPNxH<qgJbx+ithCsTFC+#Z!gI
z!Y9lq5&Yr@x;bgc!RA)697iOLFcFFuE<Vvcm4+4&IhREUdWc8|%^Xig<WVoLVNU+W
z#TSYfPVVJN;ChqE<c>u^6P)zWgvJYz2d01)B_hVF6rwswrBdG#@5MVFj~6T^bjz|b
zA-rQ4hRYH_9}b5OT3g~PR6|rtEGE485$iR%5C^cyRMqoZt=5hs<Q1gjIBqtZeZz7%
zJ1jyA^>bM&m9*7rWh;ezvGscWgpX*?&ZK!<B^Ed$nEYNS6sVH9ELJQQdAVGkEtktc
z5dU5yv^To0(<LS!6$gCvHzc)?XMyt^YAkRAkQl<a5bG@Rs-*);2Nm6e!lXpe%<J{~
zt<M=ufv6DRtmTKG6!H-j0`akh2yiyb=ks6W1h1ChESLCy&9e{;;rS>bU(7VkE4XnH
a$lwR13gJ<wDxV+#0000<MNUMnLSTY&tM_F9

literal 0
HcmV?d00001

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="12dp" />
+
+    <stroke
+        android:width="2dp"
+        android:color="#F2E7FC" />
+
+    <solid android:color="@android:color/transparent" />
+
+</shape>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="30dp"
+    android:paddingVertical="30dp"
+    tools:context=".view.FavoriteActivity">
+
+    <LinearLayout
+        android:id="@+id/exitContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/arrow" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:fontFamily="@font/mulish_bold"
+            android:text="Exit"
+            android:textColor="@color/title"
+            android:textSize="26dp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textFavorites"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="13dp"
+        android:fontFamily="@font/mulish_black"
+        android:text="Favoris"
+        android:textColor="@color/title"
+        android:textSize="30dp"
+        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>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
+<?xml version="1.0" encoding="utf-8"?>
+
 <data-extraction-rules>
     <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
-        <include .../>
-        <exclude .../>
-        -->
+
     </cloud-backup>
-    <!--
-    <device-transfer>
-        <include .../>
-        <exclude .../>
-    </device-transfer>
-    -->
+
 </data-extraction-rules>
\ 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