From fe39a09cea42f641a51a4e0c5c84028e4b2a284c Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sat, 1 Apr 2023 16:12:32 +0300 Subject: [PATCH] Use flat registration status icons Modified traffic light colors --- .../kotlin/com/tutpro/baresip/AccountActivity.kt | 2 +- .../kotlin/com/tutpro/baresip/BaresipService.kt | 14 +++++++------- .../main/kotlin/com/tutpro/baresip/UserAgent.kt | 2 +- app/src/main/res/drawable/baresip.png | Bin 469 -> 0 bytes app/src/main/res/drawable/circle_green.xml | 7 +++++++ app/src/main/res/drawable/circle_red.xml | 9 +++++++++ app/src/main/res/drawable/circle_white.xml | 7 +++++++ app/src/main/res/drawable/circle_yellow.xml | 7 +++++++ app/src/main/res/drawable/dot_green.png | Bin 1309 -> 0 bytes app/src/main/res/drawable/dot_red.png | Bin 1167 -> 0 bytes app/src/main/res/drawable/dot_white.png | Bin 4005 -> 0 bytes app/src/main/res/drawable/dot_yellow.png | Bin 1180 -> 0 bytes app/src/main/res/values/colors.xml | 6 +++--- 13 files changed, 42 insertions(+), 12 deletions(-) delete mode 100644 app/src/main/res/drawable/baresip.png create mode 100644 app/src/main/res/drawable/circle_green.xml create mode 100644 app/src/main/res/drawable/circle_red.xml create mode 100644 app/src/main/res/drawable/circle_white.xml create mode 100644 app/src/main/res/drawable/circle_yellow.xml delete mode 100644 app/src/main/res/drawable/dot_green.png delete mode 100644 app/src/main/res/drawable/dot_red.png delete mode 100644 app/src/main/res/drawable/dot_white.png delete mode 100644 app/src/main/res/drawable/dot_yellow.png 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 984ca1a2c605c784e63e2072f7126c8270fc91f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmV;`0V@89P)Z*O77TGxpR%p3QI^l@^RucnVlr_XJ-EYN#L(dYFp@DmW^a2Y5-@zC@=-g0rN(Q z*Sr8>MqB`OVAX*D1VuU$q_x2)5g8>mTopeSR{~&^@Q=N+GYy7Kn*Ryl({&Ja!yI{I zsqGQ44SY#$AAxO#=r2%4peMoI5hb^>T)c}G2 zzEPrEwUWny2^YGlV#vt})`6Pyn`MXm4jfBuYaV5r&c6fhvv$%TC6Br57O)09OKqQk zMPLRv1rCf7{aoK + + \ 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 fbea016274dd3b1beb49585a11d37e66355b43f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1309 zcmV+&1>*XNP)y2Bql;ZQ*2FB8~W0uZ@!SA@u8*BYE67HkyH(| z4@QZ7@r|S}B{eqvj4cHdBU{km7K&+$6uY>5?ZS3HX6JbBo!JFisTw!=GvqRJe)s(U zXYYXU?2pdc%W7s-vx@EYFl&T$jdg{UT&n=CvF>6W1r^)zg(5EtvCIQnfmjAI7UD<` zqeQ>XAS(oE>f-e?toXkH)UbNAhK*Hu2X{cduZ~{Y;KPc-a>&n2=%GZBlgkz@>df4d1k zeBTeTv%y7*8HafJ`riR+xOm_C_i8-*>zm2%twM!MAOeZnDDNcu2OiiA*w&z3+KtLx=BeKkP2`bG8Jk0$>4T7oa@hrRc>jE|oTcvqrcz6@cKE zgAlzjeUfiEB>+0AI8o7A>#f`IA{M!LT6lk|LcA;?!~o$G*j*5BT{J}uKv|r-;o@kR z2($4h{WSIqjvpTi@#1Fj$btO2!f$;id{n)@0v!s0rVud%?JlHUxa_CpJzu#v+Pf#i z2Bb`+k=bz!ej0?x;QSlnna*vkTaHy6*aT&{#UKDS#J0+^Nmzs{2qsweq$L2sE-p2- z6o$Ls{SNoOesEema>?IOxv#8x9kD&AtEK>uLorda0Nep!CX0+kGFZL}02il}sh}vH zOe4+47jbfA4gx1fFN;S8o4S3wO3HJfKzD&t6&;vXC#uzfnhASVz*e{hw~|UL_U;t{ zfcaz`!jq5TMqBW<1nfIo=`SjCkVn_i$sOp5NxDkt;NL|asvKF70oe`-@0WvR0C8bV zG9bYnM3X6;d6|s{9e^(0wNoPom}qyBov4)nIXNbxy>kXAm@p9H z42Y$GEsDdH_IuKz&ibRzweM^xpd2-gIhp{N#8zeV&?JDK03aDQfQu9F920ES;}lXn zt>SR+0t}pa)FsDsYeU|JL!WGf94*ZA|FQrkR}&fWJ7qOtPT`=itOp($zk7l*KzKEg>gd_#VIsJ z_|@SDA=7}(*`vbW;^{d2(K-oma|YZ6=V1Xv9-8&7wgDV2XCQpf0Jt#5ID;4i&V4+G zf!^o`nWG|m*tLC8Qd!&R0FT1~ZU;b)y3#7j0OWWIdxYoGcNPZ=(NqeC`jXK7PWY+A zP9E3pe7tqyo1#2lwUY{+q8kG4f&(|@$f~wQJVBU}!Lls^U?9yU=J3u)0#3a-6OBda zspC5P!pSYb-s7k9a~qrUvB+7@cIgtJO90sb>AeKRj3mq?CaLdQ1UrvKqDu?3<_l-} z#e>kZ|A=1M_O1)IZ!H0jUc%E=z|-KAHzdsj?|K2E$!WNIKMdWU$Khg6a+K%yA77c7 zk9_HC4rp(BP4zavj#yVqu&LA(575Mvf`K8VtCt9GUQLIL6#S=`{>sn){CR00000NkvXXu0mjfZWV0; 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 b9b151849ee6cdd8c9e0d4817f45f5c23ba3b4f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1167 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 LNkvXXu0mjfD7>#m 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 c6f99feca2ddd40155c23a6156bd687d7601171e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1180 zcmV;N1Y`S&P)UCQ4%BLJVSp2nq%=jU>hdLl($D zL9+y1jF|}um?+zf-GJZ(4L@XTbHl}Cz}&{V4GOGVTiV;>xnJ#NYff+2G0ldQBdmaW*Y0nbA`+94R&Eu&8LvbBIMt16v zq~0TUK^$m-j*d>){Kc(cU^f0Dd(Wi;DC6Ki`}Q~&Jig&o65JJ-2!#)fBXu6hUsPXw zqzkW{`3Ag){L>8btX7FOz=8^1K4|Wmd7nKE z(lj%7%kb4hF2}O+7Z7cWlUbvjE+yblSAm+f>>yn=!J9PP{R0;58I!tendGdlS(Djz zYOkAwf@Q2d4uUp_bjZI?qe(tyUJuiJOMQL_RtXSE!k z0Te@>rMgIGam7eNzV$mCZ@UgVzYH9aruu%`@AN!bx|oCo%TW!kRG@(9t4Vf|mbDT* zQ33HYP2a#vy*J^xef|z<+HY4sbCu^WT?k-Zl+0eMKuA-CK670Kvdxae(C{57dTXp( z2Kb}NwPvL&gD@*k&YBD=?}=(u6;w^s%=t&C(n1(lD-hWqn#60P5h&a?c3GyV>!8!~ zM3I@$oP}UC0WbguW&lNS6jF$+b`Hr|^P2=9@^dUo5Dnp_fe2LWRVZpaw!^-AYqgEg zz?mA23?T3`PcU#aA=$F201{ct04zW>MkoRvZ=Z%8#{!4tHm!Xsv-RXhxxfHY_H5dH zjvjM0(DNQ+6WJ+BfCQU9oPyS0L$&fkGaGrKwYVJaMMjiB$OsQsAV6vjbi7MhOCTJa zM#f`USjP)3rYtmNtEjdeXsXX)ig=L8sL*9lMP>jL=1`=yrlK^2>6OVg^_!jgnl#0823;LI;!sCjo{-e#w4*N+GnI-8uf z(p3w&W%Cuf3>rl^M`Ti3Q{kLwb_jd>??BZy-mdS>->$W*l0m+2X~?yD*0~UDrGQ2& zQ-r7!T3fZO0b|8x0D`^LaefTz>ZhdOX%C!4B^>U=mX~Y=``)&LdqqAUl`8>Ed4Pgd zL5OqE=p<118jM^Yg8iQcp!wUNM9V)Onc5{E`eqX!`s*?s&sSz)SqUHdPJ_f0`Nu`< u>5I~j=VsA&KIFe2{cnf9{`%j4TmA;@u^R!4rAaRU0000@color/colorBlack #01df01 #ff0000 - #008450 - #EFB700 - #B81D13 + #43A047 + #FDD835 + #F44336 @color/colorWhite #383838 @color/colorDark