diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8bea3d3..1175110 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -23,8 +23,8 @@ android { applicationId = "com.example.maposition" minSdk = 21 targetSdk = 36 - versionCode = 3 - versionName = "1.2" + versionCode = 4 + versionName = "1.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/maposition/MainActivity.kt b/app/src/main/java/com/example/maposition/MainActivity.kt index 4dcabd4..5b398a5 100644 --- a/app/src/main/java/com/example/maposition/MainActivity.kt +++ b/app/src/main/java/com/example/maposition/MainActivity.kt @@ -26,7 +26,6 @@ import com.google.android.gms.location.FusedLocationProviderClient import com.google.android.gms.location.LocationServices import com.google.android.gms.location.Priority import com.google.android.gms.tasks.CancellationTokenSource -import com.google.android.material.button.MaterialButton import com.google.android.material.card.MaterialCardView import com.google.android.material.progressindicator.CircularProgressIndicator import java.util.concurrent.TimeUnit @@ -49,7 +48,7 @@ class MainActivity : AppCompatActivity() { private val handler = Handler(Looper.getMainLooper()) - private lateinit var sendButton: MaterialButton + private lateinit var sendButton: View private lateinit var statusText: TextView private lateinit var progress: CircularProgressIndicator private lateinit var recipientsText: TextView @@ -166,6 +165,7 @@ class MainActivity : AppCompatActivity() { busy = true resetReportState() sendButton.isEnabled = false + sendButton.alpha = 0.55f progress.visibility = View.VISIBLE setStatus(getString(R.string.status_locating)) @@ -285,6 +285,7 @@ class MainActivity : AppCompatActivity() { busy = false progress.visibility = View.GONE sendButton.isEnabled = true + sendButton.alpha = 1f } private fun resetReportState() { diff --git a/app/src/main/res/drawable-nodpi/bg_watermark.jpg b/app/src/main/res/drawable-nodpi/bg_watermark.jpg new file mode 100644 index 0000000..beada34 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/bg_watermark.jpg differ diff --git a/app/src/main/res/drawable/globe_button_bg.xml b/app/src/main/res/drawable/globe_button_bg.xml new file mode 100644 index 0000000..c281c10 --- /dev/null +++ b/app/src/main/res/drawable/globe_button_bg.xml @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_globe.xml b/app/src/main/res/drawable/ic_globe.xml new file mode 100644 index 0000000..8a4121d --- /dev/null +++ b/app/src/main/res/drawable/ic_globe.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3821c46..8c08d1f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,51 +2,98 @@ + android:layout_height="match_parent"> + + + + - + app:layout_constraintVertical_bias="0.36"> + + + + + + + + @@ -92,9 +143,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/recipients_label" + android:textColor="?attr/colorOnSurfaceVariant" android:textSize="13sp" - android:textStyle="bold" - android:textColor="?attr/colorOnSurfaceVariant" /> + android:textStyle="bold" /> - + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 97f2d28..509d19e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,7 @@ Ma Position Paramètres + Votre position par SMS, en un geste Retour