diff --git a/src/app/build.gradle b/src/app/build.gradle index 5bc46b5..3329cf8 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -33,7 +33,8 @@ android { } dependencies { - + implementation 'com.github.bumptech.glide:glide:4.12.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' 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 09bb59c..ab677b8 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 @@ -3,11 +3,15 @@ package uca.iut.clermont.view import android.app.Activity import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import com.bumptech.glide.Glide import uca.iut.clermont.R class HomeActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_home) + Glide.with(this) + .load("https://crests.football-data.org/1765.svg") + .into(findViewById(R.id.ImageFirstTeam)) } } \ No newline at end of file diff --git a/src/app/src/main/res/font/mulish_black.ttf b/src/app/src/main/res/font/mulish_black.ttf new file mode 100644 index 0000000..2fab2a5 Binary files /dev/null and b/src/app/src/main/res/font/mulish_black.ttf differ diff --git a/src/app/src/main/res/font/mulish_bold.ttf b/src/app/src/main/res/font/mulish_bold.ttf new file mode 100644 index 0000000..f203a0f Binary files /dev/null and b/src/app/src/main/res/font/mulish_bold.ttf differ diff --git a/src/app/src/main/res/font/mulish_extrabold.ttf b/src/app/src/main/res/font/mulish_extrabold.ttf new file mode 100644 index 0000000..f203a0f Binary files /dev/null and b/src/app/src/main/res/font/mulish_extrabold.ttf differ diff --git a/src/app/src/main/res/layout/activity_home.xml b/src/app/src/main/res/layout/activity_home.xml index 5151752..58339d5 100644 --- a/src/app/src/main/res/layout/activity_home.xml +++ b/src/app/src/main/res/layout/activity_home.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:paddingHorizontal="30dp" android:layout_height="match_parent" + android:paddingHorizontal="30dp" tools:context=".view.HomeActivity"> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/textViewTitle" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/textViewSubtitle"> + android:contentDescription="search icon" + android:src="@drawable/SearchIcon" /> + android:textSize="15dp" /> @@ -74,44 +74,123 @@ android:layout_marginTop="20dp" android:text="Recent Matches" android:textColor="@color/title" - android:textStyle="bold" android:textSize="20dp" + android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/searchBarContainer"/> + app:layout_constraintTop_toBottomOf="@+id/searchBarContainer" /> + app:layout_constraintTop_toBottomOf="@+id/textViewRecentMatches"> + android:fontFamily="@font/mulish_bold" + android:maxLines="1" + android:text="Champions League - Groupe Stage: Matchay" + android:textColor="@color/title" + android:textSize="14dp" + android:textStyle="bold" /> - - - + android:orientation="horizontal" + android:layout_marginBottom="10dp"> + + + + + + + + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/src/app/src/main/res/values/colors.xml b/src/app/src/main/res/values/colors.xml index 47cc502..415f5cd 100644 --- a/src/app/src/main/res/values/colors.xml +++ b/src/app/src/main/res/values/colors.xml @@ -5,4 +5,5 @@ #F6F6F6 #FF000000 #FFFFFFFF + #E1DFDF \ No newline at end of file