diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index f7edf9c8..c3db50e2 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -657,7 +657,7 @@ class AccountActivity : AppCompatActivity() { AccountsActivity.saveAccounts() if (reRegister) { - ua.status = R.drawable.dot_yellow + ua.status = R.drawable.circle_yellow if (acc.regint == 0) Api.ua_unregister(ua.uap) else diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index f8b05aa2..9ed9138a 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -566,9 +566,9 @@ class BaresipService: Service() { val ua = UserAgent(uap) ua.status = if (ua.account.regint == 0) - R.drawable.dot_white + R.drawable.circle_white else - R.drawable.dot_yellow + R.drawable.circle_yellow uas.add(ua) val acc = ua.account @@ -620,7 +620,7 @@ class BaresipService: Service() { if (uas[accountIndex].account.aor == aor) { when (ev[0]) { "registering", "unregistering" -> { - ua.status = R.drawable.dot_yellow + ua.status = R.drawable.circle_yellow updateStatusNotification() if (isMainVisible) registrationUpdate.postValue(System.currentTimeMillis()) @@ -628,9 +628,9 @@ class BaresipService: Service() { } "registered" -> { ua.status = if (Api.account_regint(ua.account.accp) == 0) - R.drawable.dot_white + R.drawable.circle_white else - R.drawable.dot_green + R.drawable.circle_green updateStatusNotification() if (isMainVisible) registrationUpdate.postValue(System.currentTimeMillis()) @@ -638,9 +638,9 @@ class BaresipService: Service() { } "registering failed" -> { ua.status = if (Api.account_regint(ua.account.accp) == 0) - R.drawable.dot_white + R.drawable.circle_white else - R.drawable.dot_red + R.drawable.circle_red updateStatusNotification() if (isMainVisible) registrationUpdate.postValue(System.currentTimeMillis()) diff --git a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt index 16d939c7..e41e8e70 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt @@ -3,7 +3,7 @@ package com.tutpro.baresip class UserAgent(val uap: Long) { val account = Account(Api.ua_account(uap)) - var status = R.drawable.dot_white + var status = R.drawable.circle_white fun callAlloc(xCall: Long, videoMode: Int): Long { return Api.ua_call_alloc(uap, xCall, videoMode) diff --git a/app/src/main/res/drawable/baresip.png b/app/src/main/res/drawable/baresip.png deleted file mode 100644 index 984ca1a2..00000000 Binary files a/app/src/main/res/drawable/baresip.png and /dev/null differ diff --git a/app/src/main/res/drawable/circle_green.xml b/app/src/main/res/drawable/circle_green.xml new file mode 100644 index 00000000..d47778d7 --- /dev/null +++ b/app/src/main/res/drawable/circle_green.xml @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_red.xml b/app/src/main/res/drawable/circle_red.xml new file mode 100644 index 00000000..b060591a --- /dev/null +++ b/app/src/main/res/drawable/circle_red.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/app/src/main/res/drawable/circle_white.xml b/app/src/main/res/drawable/circle_white.xml new file mode 100644 index 00000000..02e90016 --- /dev/null +++ b/app/src/main/res/drawable/circle_white.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/drawable/circle_yellow.xml b/app/src/main/res/drawable/circle_yellow.xml new file mode 100644 index 00000000..2a83258a --- /dev/null +++ b/app/src/main/res/drawable/circle_yellow.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/drawable/dot_green.png b/app/src/main/res/drawable/dot_green.png deleted file mode 100644 index fbea0162..00000000 Binary files a/app/src/main/res/drawable/dot_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/dot_red.png b/app/src/main/res/drawable/dot_red.png deleted file mode 100644 index b9b15184..00000000 Binary files a/app/src/main/res/drawable/dot_red.png and /dev/null differ diff --git a/app/src/main/res/drawable/dot_white.png b/app/src/main/res/drawable/dot_white.png deleted file mode 100644 index 5eafeb6e..00000000 Binary files a/app/src/main/res/drawable/dot_white.png and /dev/null differ diff --git a/app/src/main/res/drawable/dot_yellow.png b/app/src/main/res/drawable/dot_yellow.png deleted file mode 100644 index c6f99fec..00000000 Binary files a/app/src/main/res/drawable/dot_yellow.png and /dev/null differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a1a37e45..aaa0b65e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -16,9 +16,9 @@ @color/colorBlack #01df01 #ff0000 - #008450 - #EFB700 - #B81D13 + #43A047 + #FDD835 + #F44336 @color/colorWhite #383838 @color/colorDark