Izmenjena boja dijaloga i izmenjen dijalog obavestenja o notifikacijama #83

3 files changed, 21 insertions, 7 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
index 6d8afd6..49c61c7 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
@@ -1,7 +1,6 @@
 package com.example.brzodolokacije.Activities
 
 import android.Manifest
-import android.app.AlertDialog
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
@@ -11,6 +10,7 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -27,6 +27,7 @@ import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.example.brzodolokacije.chat.Notifications
 import com.example.brzodolokacije.chat.SignalRListener
 import com.example.brzodolokacije.databinding.ActivityChatBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import retrofit2.Call
@@ -120,12 +121,13 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
     }
 
     fun launchInfoDialog(){
-        val alertDialog: AlertDialog = AlertDialog.Builder(this@ChatActivity).create()
-        alertDialog.setTitle("Obaveštenje")
-        alertDialog.setMessage("Potrebno je restartovati aplikaciju da bi se sačuvale promene.")
-        alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, "OK"
+        var builder= MaterialAlertDialogBuilder(this)
+        builder.background = AppCompatResources.getDrawable(this,R.drawable.rounded_alert_background)
+        builder.setTitle("Obaveštenje")
+        builder.setMessage("Potrebno je restartovati aplikaciju da bi se sačuvale promene.")
+        builder.setPositiveButton("OK",
         ) { dialog, _ -> dialog.dismiss() }
-        alertDialog.show()
+        builder.show()
     }
 
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
index 724b184..9fef0e9 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -122,7 +122,7 @@ class MapsActivity : AppCompatActivity() {
     fun addLocation(){
         var editText=EditText(this)
         var builder=MaterialAlertDialogBuilder(this)
-        builder.background = AppCompatResources.getDrawable(this,R.drawable.rounded_picture_background)
+        builder.background = AppCompatResources.getDrawable(this,R.drawable.rounded_alert_background)
         builder.setView(editText)
         builder.setTitle("Unesite naziv lokacije")
         if(searchBar.text!=null && searchBar.text.toString().trim()!="")
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_alert_background.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_alert_background.xml
new file mode 100644
index 0000000..e081091
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_alert_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners  android:radius="20dp"/>
+    <solid android:color="#FFFCFCFC"></solid>
+<!--    <padding-->
+<!--        android:left="10dp"-->
+<!--        android:top="5dp"-->
+<!--        android:right="10dp"-->
+<!--        android:bottom="5dp" >-->
+
+<!--    </padding>-->
+</shape>