diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b75758c..d1e7f40 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 = 5
- versionName = "1.4"
+ versionCode = 6
+ versionName = "1.5"
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 7394e13..75a6b14 100644
--- a/app/src/main/java/com/example/maposition/MainActivity.kt
+++ b/app/src/main/java/com/example/maposition/MainActivity.kt
@@ -9,6 +9,9 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.content.pm.PackageManager
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.Typeface
import android.location.Location
import android.os.Build
import android.os.Bundle
@@ -125,11 +128,20 @@ class MainActivity : AppCompatActivity() {
groupChips.visibility = View.VISIBLE
val active = Prefs.getActiveGroup(this)!!
+ val blue = ContextCompat.getColor(this, R.color.brand_blue)
groups.forEach { g ->
+ val checked = g.name == active.name
val chip = Chip(this).apply {
text = g.name
isCheckable = true
- isChecked = g.name == active.name
+ isChecked = checked
+ if (checked) {
+ chipBackgroundColor = ColorStateList.valueOf(blue)
+ setTextColor(Color.WHITE)
+ typeface = Typeface.DEFAULT_BOLD
+ } else {
+ alpha = 0.5f
+ }
setOnClickListener {
Prefs.setActiveGroupName(this@MainActivity, g.name)
refreshRecipientsCard()
diff --git a/app/src/main/res/drawable/globe_button_bg.xml b/app/src/main/res/drawable/globe_button_bg.xml
index c281c10..32c6cc6 100644
--- a/app/src/main/res/drawable/globe_button_bg.xml
+++ b/app/src/main/res/drawable/globe_button_bg.xml
@@ -2,18 +2,42 @@
-
-
-
-
-
+
+
+
-
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d0caca3..6b4bf80 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,18 +4,25 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
+ app:layout_constraintTop_toTopOf="@id/bgGuide" />
+ app:layout_constraintTop_toBottomOf="@id/subtitleText"
+ app:layout_constraintVertical_bias="0.85">
-
+
+
-
-
-
-
-
+ android:letterSpacing="0.08"
+ android:lineSpacingExtra="4dp"
+ android:shadowColor="#99000000"
+ android:shadowDy="2"
+ android:shadowRadius="8"
+ android:text="@string/send_button"
+ android:textColor="@color/white"
+ android:textSize="17sp"
+ android:textStyle="bold" />