diff --git a/app/src/main/java/com/example/maposition/MainActivity.kt b/app/src/main/java/com/example/maposition/MainActivity.kt index ccb05b1..8398c47 100644 --- a/app/src/main/java/com/example/maposition/MainActivity.kt +++ b/app/src/main/java/com/example/maposition/MainActivity.kt @@ -13,6 +13,7 @@ import android.content.res.ColorStateList import android.graphics.Color import android.graphics.Typeface import android.location.Location +import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Handler @@ -97,6 +98,9 @@ class MainActivity : AppCompatActivity() { sendButton.setOnClickListener { startSendFlow() } findViewById(R.id.recipientsCard).setOnClickListener { openSettings() } + findViewById(R.id.emergencyButton).setOnClickListener { + startActivity(Intent(Intent.ACTION_DIAL, Uri.parse("tel:112"))) + } } override fun onResume() { @@ -122,9 +126,11 @@ class MainActivity : AppCompatActivity() { if (groups.isEmpty()) { groupChips.visibility = View.GONE + recipientsText.visibility = View.VISIBLE recipientsText.text = getString(R.string.recipients_none) return } + recipientsText.visibility = View.GONE groupChips.visibility = View.VISIBLE val active = Prefs.getActiveGroup(this)!! diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8cb62ff..074c747 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -90,12 +90,14 @@ android:id="@+id/recipientsCard" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="12dp" android:clickable="true" android:focusable="true" app:cardCornerRadius="18dp" app:cardElevation="3dp" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@id/emergencyButton" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> @@ -103,7 +105,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="16dp"> + android:paddingStart="16dp" + android:paddingTop="10dp" + android:paddingEnd="16dp" + android:paddingBottom="10dp"> - + app:chipSpacingVertical="0dp" + app:singleLine="false" + app:singleSelection="true" /> - - + android:textSize="15sp" + android:visibility="gone" /> + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c84e7a6..ec8819e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,5 +3,6 @@ #FF000000 #FFFFFFFF #1A73E8 + #C62828 #708164 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e83bdf1..492f33e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ ENVOYER\nMA POSITION + 🚨 APPEL URGENCES — 112 Groupe de destinataires — toucher pour gérer Aucun groupe de destinataires.\nTouchez ici pour en créer un.