diff --git a/app/.idea/.gitignore b/app/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/app/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/app/.idea/gradle.xml b/app/.idea/gradle.xml new file mode 100644 index 0000000..b898c0a --- /dev/null +++ b/app/.idea/gradle.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.idea/misc.xml b/app/.idea/misc.xml new file mode 100644 index 0000000..6ff4d26 --- /dev/null +++ b/app/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/app/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9faed80..5d7d01b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,6 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Ouaff" tools:targetApi="31"> @@ -25,6 +24,8 @@ android:name="android.app.lib_name" android:value="" /> + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..7a96570 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/fr/iut/ouaff/data/chargeur/Stub.kt b/app/src/main/java/fr/iut/ouaff/data/chargeur/Stub.kt index 5d14e83..59f18ce 100644 --- a/app/src/main/java/fr/iut/ouaff/data/chargeur/Stub.kt +++ b/app/src/main/java/fr/iut/ouaff/data/chargeur/Stub.kt @@ -12,6 +12,17 @@ class Stub : Chargeur { listeChien.add(Chien("Daisy", "Chihuahua", Genre.Femele, 20, 2)) listeChien.add(Chien("Deku", "Labrador", Genre.Femele, 35,1)) + listeChien.add(Chien("Louis", "Golden Retriever", Genre.Male, 40, 0)) + listeChien.add(Chien("Elfe", "Dalmatien", Genre.Inconnu, 30, 1)) + listeChien.add(Chien("Dexter", "Pitbull allemand", Genre.Male, 50, 3)) + listeChien.add(Chien("Daisy", "Chihuahua", Genre.Femele, 20, 2)) + listeChien.add(Chien("Deku", "Labrador", Genre.Femele, 35,1)) + listeChien.add(Chien("Louis", "Golden Retriever", Genre.Male, 40, 0)) + listeChien.add(Chien("Elfe", "Dalmatien", Genre.Inconnu, 30, 1)) + listeChien.add(Chien("Dexter", "Pitbull allemand", Genre.Male, 50, 3)) + listeChien.add(Chien("Daisy", "Chihuahua", Genre.Femele, 20, 2)) + listeChien.add(Chien("Deku", "Labrador", Genre.Femele, 35,1)) + return listeChien } } \ No newline at end of file diff --git a/app/src/main/java/fr/iut/ouaff/vues/DetailActivity.kt b/app/src/main/java/fr/iut/ouaff/vues/DetailActivity.kt new file mode 100644 index 0000000..a3836dc --- /dev/null +++ b/app/src/main/java/fr/iut/ouaff/vues/DetailActivity.kt @@ -0,0 +1,65 @@ +package fr.iut.ouaff.vues + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import fr.iut.ouaff.R +import fr.iut.ouaff.modele.metier.Genre +import fr.iut.ouaff.vues.fragment.FragmentDetail + + + +class DetailActivity : AppCompatActivity(), FragmentDetail.ListenerDetail { + + private lateinit var fragmentDetail:FragmentDetail + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_detail) + + + if(supportFragmentManager.findFragmentById(R.id.id_fragmentDetail) == null){ + fragmentDetail = FragmentDetail(this) + supportFragmentManager.beginTransaction() + .add(R.id.id_fragmentDetail, fragmentDetail) + .commit() + } + } + + + companion object{ + private const val NOMCHIEN:String = "nomChien" + private const val RACECHIEN:String = "raceChien" + private const val GENRECHIEN:String = "genreChien" + private const val MESURECHIEN:String = "mesureChien" + private const val AGRESSIVITECHIEN:String = "agressiviteChien" + + public fun createIntent(context:Context): Intent = Intent(context, DetailActivity::class.java) + + public fun getNomChien(result:Intent) = result.getStringExtra(NOMCHIEN) + public fun getRaceChien(result:Intent) = result.getStringExtra(RACECHIEN) + public fun getGenreChien(result:Intent) = result.getSerializableExtra((GENRECHIEN)) + public fun getMesureChien(result:Intent) = result.getIntExtra(MESURECHIEN, 0) + public fun getAgressiviteChien(result:Intent) = result.getIntExtra(AGRESSIVITECHIEN, 0) + } + + override fun ajouterChien( + nom: String?, + race: String?, + genre: Genre, + poids: Int, + agressivite: Int + ) { + val data = Intent().apply { + putExtra(NOMCHIEN, nom) + putExtra(RACECHIEN, race) + putExtra(GENRECHIEN, genre) + putExtra(MESURECHIEN, poids) + putExtra(AGRESSIVITECHIEN, agressivite) + } + + setResult(RESULT_OK, data) + finish() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/iut/ouaff/vues/MainActivity.kt b/app/src/main/java/fr/iut/ouaff/vues/MainActivity.kt index e418215..60e6fb8 100644 --- a/app/src/main/java/fr/iut/ouaff/vues/MainActivity.kt +++ b/app/src/main/java/fr/iut/ouaff/vues/MainActivity.kt @@ -1,25 +1,52 @@ package fr.iut.ouaff.vues +import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import androidx.fragment.app.Fragment import fr.iut.ouaff.R import fr.iut.ouaff.data.chargeur.Stub import fr.iut.ouaff.modele.metier.Chien +import fr.iut.ouaff.modele.metier.Genre import fr.iut.ouaff.vues.fragment.FragmentDetail import fr.iut.ouaff.vues.fragment.FragmentMaster class MainActivity : AppCompatActivity() { private var listeChiens: MutableList = Stub().charger("") + private lateinit var fragment:FragmentMaster + private var activityLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()){ result -> + if(result.resultCode == RESULT_OK){ + result.data?.let { ajouterChien( + DetailActivity.getNomChien(it), + DetailActivity.getRaceChien(it), + DetailActivity.getGenreChien(it) as Genre, + DetailActivity.getMesureChien(it), + DetailActivity.getAgressiviteChien(it)) + } + } + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - if(supportFragmentManager.findFragmentById(R.id.id_fragment) == null){ - supportFragmentManager.beginTransaction() - .add(R.id.id_fragment, FragmentMaster(listeChiens)) - .commit() + if(supportFragmentManager.findFragmentById(R.id.id_fragment) == null){ + fragment = FragmentMaster(listeChiens) + supportFragmentManager.beginTransaction() + .add(R.id.id_fragment, fragment) + .commit() + } } + + override fun onStart() { + super.onStart() + fragment.getBoutonAjouterChien().setOnClickListener() { activityLauncher.launch(DetailActivity.createIntent(this)) } + } + + private fun ajouterChien(nom: String?, race: String?, genre: Genre, poids: Int, agressivite: Int) { + if(nom != null && race != null) listeChiens.add(Chien(nom, race, genre, poids, agressivite)) } } \ No newline at end of file diff --git a/app/src/main/java/fr/iut/ouaff/vues/adapter/AdapterChien.kt b/app/src/main/java/fr/iut/ouaff/vues/adapter/AdapterChien.kt index ca6352d..79c5bd2 100644 --- a/app/src/main/java/fr/iut/ouaff/vues/adapter/AdapterChien.kt +++ b/app/src/main/java/fr/iut/ouaff/vues/adapter/AdapterChien.kt @@ -3,6 +3,7 @@ package fr.iut.ouaff.vues.adapter import android.content.res.Resources import android.view.LayoutInflater import android.view.ViewGroup +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ViewHolder import fr.iut.ouaff.R @@ -38,14 +39,13 @@ class AdapterChien(private var listeChiens:MutableList): RecyclerView.Ada /// setter la couleur à afficher suivant son aggressivité // when équivalent du switch case en Java ou en C# - var color = R.color.colorNice + holder.cardViewChien.setCardBackgroundColor(ContextCompat.getColor(holder.itemView.context, when(chienAAfficher.agressivite){ - 1 -> color = R.color.colorNormal - 2 -> color = R.color.colorBad - 3 -> color = R.color.colorAggressive - } - - holder.cardViewChien.setCardBackgroundColor(ressources.getColor(color)) + 1 -> R.color.colorNormal + 2 -> R.color.colorBad + 3 -> R.color.colorAggressive + else -> R.color.colorNice + })) } } diff --git a/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentDetail.kt b/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentDetail.kt index ce89012..f2799c7 100644 --- a/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentDetail.kt +++ b/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentDetail.kt @@ -4,11 +4,24 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ArrayAdapter +import android.widget.Button +import android.widget.EditText +import android.widget.ImageButton +import android.widget.RatingBar +import android.widget.Spinner import android.widget.Toolbar import androidx.fragment.app.Fragment import fr.iut.ouaff.R +import fr.iut.ouaff.modele.metier.Genre -class FragmentDetail : Fragment() { +class FragmentDetail(private var listener:ListenerDetail) : Fragment() { + + private lateinit var boutonAjouterChien:ImageButton + + interface ListenerDetail{ + fun ajouterChien(nom: String?, race: String?, genre: Genre, poids: Int, agressivite: Int) + } override fun onCreateView( inflater: LayoutInflater, @@ -17,6 +30,19 @@ class FragmentDetail : Fragment() { ): View? { var view = inflater.inflate(R.layout.fragment_detail , container, false) + + var spinnerGenre = view.findViewById(R.id.spinnerGenre) + spinnerGenre.adapter = ArrayAdapter(view.context, R.layout.cellule_spinner, Genre.values()) + + boutonAjouterChien = view.findViewById(R.id.bouttonAjouter) + boutonAjouterChien.setOnClickListener() { listener.ajouterChien( + view.findViewById(R.id.textFieldNomChien).text.toString(), + view.findViewById(R.id.textFieldRaceChien).text.toString(), + spinnerGenre.selectedItem as Genre, + view.findViewById(R.id.textFieldMesureChien).text.toString().toInt(), + view.findViewById(R.id.ratingBarAgressivite).rating.toInt()) + } + return view } } \ No newline at end of file diff --git a/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentMaster.kt b/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentMaster.kt index fc52c96..f66969e 100644 --- a/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentMaster.kt +++ b/app/src/main/java/fr/iut/ouaff/vues/fragment/FragmentMaster.kt @@ -4,25 +4,33 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.floatingactionbutton.FloatingActionButton import fr.iut.ouaff.R import fr.iut.ouaff.modele.metier.Chien import fr.iut.ouaff.vues.adapter.AdapterChien class FragmentMaster(private var listeChiens: MutableList) : Fragment() { + private lateinit var boutonAjouterChien: FloatingActionButton + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - val view = inflater.inflate(R.layout.fragment_master, container); + val view = inflater.inflate(R.layout.fragment_master, container, false); val recyclerView = view.findViewById(R.id.recyclerViewChien); - //recyclerView.layoutManager = GridLayoutManager(context, 2, GridLayoutManager.VERTICAL, false) + recyclerView.layoutManager = GridLayoutManager(context, 2, GridLayoutManager.VERTICAL, false) recyclerView.adapter = AdapterChien(listeChiens) - return super.onCreateView(inflater, container, savedInstanceState) + + boutonAjouterChien = view.findViewById(R.id.floatingActionButton) + return view } + public fun getBoutonAjouterChien() = boutonAjouterChien + } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml new file mode 100644 index 0000000..b9b8eca --- /dev/null +++ b/app/src/main/res/drawable/ic_add.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_add_pet.xml b/app/src/main/res/drawable/ic_add_pet.xml new file mode 100644 index 0000000..b6fb20c --- /dev/null +++ b/app/src/main/res/drawable/ic_add_pet.xml @@ -0,0 +1,43 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 0000000..f9213d2 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml new file mode 100644 index 0000000..99caef9 --- /dev/null +++ b/app/src/main/res/drawable/ic_done.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_empty_shelter.xml b/app/src/main/res/drawable/ic_empty_shelter.xml new file mode 100644 index 0000000..32841b3 --- /dev/null +++ b/app/src/main/res/drawable/ic_empty_shelter.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..7708a14 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml new file mode 100644 index 0000000..fbe0080 --- /dev/null +++ b/app/src/main/res/drawable/ic_person.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_time.xml b/app/src/main/res/drawable/ic_time.xml new file mode 100644 index 0000000..da57663 --- /dev/null +++ b/app/src/main/res/drawable/ic_time.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml new file mode 100644 index 0000000..7df582c --- /dev/null +++ b/app/src/main/res/layout/activity_detail.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 88cec49..d4204e4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,8 +4,8 @@ android:layout_height="match_parent"> \ No newline at end of file diff --git a/app/src/main/res/layout/cellule_chien.xml b/app/src/main/res/layout/cellule_chien.xml index 6929fa7..b25d931 100644 --- a/app/src/main/res/layout/cellule_chien.xml +++ b/app/src/main/res/layout/cellule_chien.xml @@ -1,23 +1,50 @@ + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/cardViewChien" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:layout_marginTop="@dimen/margin_dog_card" + android:layout_marginStart="@dimen/margin_dog_card" + android:layout_marginLeft="@dimen/margin_dog_card" + android:layout_marginRight="@dimen/margin_dog_card" + app:cardCornerRadius="@dimen/margin_dog_card"> + android:orientation="vertical" + android:adjustViewBounds="true"> + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:layout_marginRight="16dp" + android:gravity="center_horizontal" + android:text="Miss Chiwa" + android:textAlignment="center" + android:textColor="@color/colorPrimaryText" + android:textSize="20sp" + android:textStyle="bold" /> + android:id="@+id/raceChien" + android:text="Chiwaua" + android:layout_marginTop="8dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginBottom="16dp" + android:textColor="@color/colorSecondaryText" + /> \ No newline at end of file diff --git a/app/src/main/res/layout/cellule_spinner.xml b/app/src/main/res/layout/cellule_spinner.xml new file mode 100644 index 0000000..36db01b --- /dev/null +++ b/app/src/main/res/layout/cellule_spinner.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml index 8260f35..f2d0798 100644 --- a/app/src/main/res/layout/fragment_detail.xml +++ b/app/src/main/res/layout/fragment_detail.xml @@ -5,7 +5,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + app:layout_constraintRight_toLeftOf="@id/barrier" + app:layout_constraintTop_toBottomOf="@+id/mesureChien" /> + app:layout_constraintTop_toBottomOf="@+id/genreChien" /> + app:layout_constraintTop_toBottomOf="@+id/raceChien" /> + app:layout_constraintRight_toLeftOf="@id/barrier" + app:layout_constraintTop_toBottomOf="@+id/nomChien" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintRight_toLeftOf="@id/barrier" + app:layout_constraintTop_toBottomOf="@+id/toolbar" /> + app:constraint_referenced_ids="nomChien,genreChien,mesureChien,agressiviteChien" + tools:layout_editor_absoluteX="78dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_master.xml b/app/src/main/res/layout/fragment_master.xml index 10d9e78..c97a081 100644 --- a/app/src/main/res/layout/fragment_master.xml +++ b/app/src/main/res/layout/fragment_master.xml @@ -1,14 +1,28 @@ + + + android:id="@+id/recyclerViewChien" + android:layout_margin="10dp"/> + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..e94c015 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..3cdd800 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..983842c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..bea3753 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..994bab7 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..2440da6 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..7ab2613 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..feb2584 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..12aac79 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..f9d2d79 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..deb357a --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 10dp + 20sp + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..6f62a8c --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FF2424 + \ No newline at end of file