jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- More layout/string clean up.

Browse Source
This commit is contained in:
Juha Heinanen
2019-05-09 10:42:47 +03:00
parent 884b762fbf
commit 98b3499643
16 changed files with 126 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
View File

@ -98,7 +98,7 @@ class ChatsActivity: AppCompatActivity() {
true
}
peerUri = findViewById(R.id.peerUri) as AutoCompleteTextView
peerUri = findViewById(R.id.peer) as AutoCompleteTextView
peerUri.threshold = 2
peerUri.setAdapter(ArrayAdapter(this, android.R.layout.select_dialog_item,
Contact.contacts().map{Contact -> Contact.name}))

20
app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
View File

@ -53,11 +53,11 @@ class ContactListAdapter(private val cxt: Context, private val rows: ArrayList<C
}
}
val builder = AlertDialog.Builder(cxt, R.style.Theme_AppCompat)
builder.setMessage("Do you want to call or send message to '" +
"${Contact.contacts()[pos].name}'?")
.setNeutralButton("Call", dialogClickListener)
.setNegativeButton("Send Message", dialogClickListener)
.setPositiveButton("Cancel", dialogClickListener)
builder.setMessage(cxt.getString(R.string.contact_action_question) +
" '${Contact.contacts()[pos].name}'?")
.setNeutralButton(cxt.getText(R.string.call), dialogClickListener)
.setNegativeButton(cxt.getText(R.string.send_message), dialogClickListener)
.setPositiveButton(cxt.getText(R.string.cancel), dialogClickListener)
.show()
}
}
@ -74,14 +74,14 @@ class ContactListAdapter(private val cxt: Context, private val rows: ArrayList<C
}
}
val builder = AlertDialog.Builder(cxt, R.style.Theme_AppCompat)
builder.setMessage("Do you want to delete contact '" +
"${Contact.contacts()[pos].name}'?")
.setPositiveButton("Cancel", dialogClickListener)
.setNegativeButton("Delete Contact", dialogClickListener)
builder.setMessage(cxt.getString(R.string.contact_delete_question) +
" '${Contact.contacts()[pos].name}'?")
.setNegativeButton(cxt.getText(R.string.delete), dialogClickListener)
.setPositiveButton(cxt.getText(R.string.cancel), dialogClickListener)
.show()
true
}
val actionView = rowView.findViewById(R.id.action) as ImageButton
val actionView = rowView.findViewById(R.id.edit) as ImageButton
actionView.setOnClickListener { _ ->
val i = Intent(cxt, ContactActivity::class.java)
val b = Bundle()

2
app/src/main/res/layout/account_spinner.xml
View File

@ -13,7 +13,7 @@
<ImageView
android:id="@+id/spinnerImage"
android:contentDescription="@string/account" />
android:contentDescription="@string/status" />
<TextView
android:id="@+id/spinnerText"

4
app/src/main/res/layout/activity_account.xml
View File

@ -99,11 +99,11 @@
<EditText
android:id="@+id/Outbound2"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:hint="@string/sip_uri_of_another_proxy_server"
android:textSize="18sp"
android:inputType="textEmailAddress"
android:importantForAutofill="no"
android:layout_width="fill_parent" >
android:importantForAutofill="no" >
</EditText>
<RelativeLayout

14
app/src/main/res/layout/activity_chat.xml
View File

@ -33,12 +33,12 @@
android:id="@+id/text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toStartOf="@id/sendButton"
android:textSize="18sp"
android:inputType="textMultiLine"
android:scrollHorizontally="false"
android:importantForAutofill="no"
android:layout_alignParentBottom="true"
android:layout_toStartOf="@id/sendButton"
android:autofillHints="text"
android:hint="@string/new_message" >
</EditText>
@ -46,11 +46,13 @@
android:id="@+id/sendButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/send"
android:background="@null"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="2dp" >
android:layout_marginBottom="2dp"
android:paddingTop="10dp"
android:src="@drawable/send"
android:background="@null"
android:contentDescription="@string/send" >
</ImageButton>
</RelativeLayout>

15
app/src/main/res/layout/activity_chats.xml
View File

@ -22,7 +22,8 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_below="@+id/account"
android:layout_above="@id/peerUri"
android:layout_above="@id/peer"
android:layout_marginBottom="10dp"
android:transcriptMode="alwaysScroll"
android:stackFromBottom="true"
android:divider="#00000000"
@ -30,14 +31,10 @@
</ListView>
<AutoCompleteTextView
android:id="@+id/peerUri"
android:layout_width="wrap_content"
android:id="@+id/peer"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="0dp"
android:layout_marginBottom="10dp"
android:layout_toStartOf="@+id/plusButton"
android:textSize="18sp"
android:inputType="textEmailAddress"
@ -50,8 +47,10 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="2dp"
android:src="@drawable/plus"
android:background="@null" >
android:background="@null"
android:contentDescription="@string/add" >
</ImageButton>
</RelativeLayout>

23
app/src/main/res/layout/activity_config.xml
View File

@ -26,6 +26,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/AutoStart"
android:textSize="18sp"
android:textColor="@android:color/black"
android:onClick="onClick"
@ -46,7 +47,6 @@
android:id="@+id/ListenAddressTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:onClick="onClick"
android:text="@string/listen_address"
android:textColor="@android:color/black"
@ -57,10 +57,11 @@
android:id="@+id/ListenAddress"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginBottom="12dp"
android:textSize="18sp"
android:hint="@string/_0_0_0_0_5060" >
android:hint="@string/_0_0_0_0_5060"
android:inputType="textUri"
android:importantForAutofill="no" >
</EditText>
<RelativeLayout
@ -74,6 +75,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/PreferIPv6"
android:textSize="18sp"
android:textColor="@android:color/black"
android:onClick="onClick"
@ -94,7 +96,6 @@
android:id="@+id/DnsServersTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:onClick="onClick"
android:text="@string/dns_servers"
android:textColor="@android:color/black"
@ -105,9 +106,11 @@
android:id="@+id/DnsServers"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginBottom="12dp"
android:textSize="18sp">
android:textSize="18sp"
android:inputType="textUri"
android:hint="@string/_8_8_8_8_53"
android:importantForAutofill="no" >
</EditText>
<RelativeLayout
@ -135,7 +138,9 @@
android:layout_marginStart="10dp"
android:textSize="18sp"
android:scrollHorizontally="true"
android:inputType="numberDecimal" >
android:inputType="numberDecimal"
android:hint="@string/_28000"
android:importantForAutofill="no" >
</EditText>
</RelativeLayout>
@ -150,6 +155,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/IceLite"
android:textSize="18sp"
android:textColor="@android:color/black"
android:onClick="onClick"
@ -177,6 +183,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/VolumeSpinner"
android:textSize="18sp"
android:textColor="@android:color/black"
android:onClick="onClick"
@ -204,6 +211,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/Debug"
android:textSize="18sp"
android:textColor="@android:color/black"
android:onClick="onClick"
@ -231,6 +239,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/Reset"
android:textSize="18sp"
android:textColor="@android:color/black"
android:onClick="onClick"

3
app/src/main/res/layout/activity_contact.xml
View File

@ -39,11 +39,12 @@
<EditText
android:id="@+id/Uri"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/sip_uri"
android:inputType="textUri"
android:textSize="18sp"
android:layout_width="fill_parent">
android:importantForAutofill="no" >
</EditText>
</LinearLayout>

3
app/src/main/res/layout/activity_contacts.xml
View File

@ -23,7 +23,8 @@
android:src="@drawable/plus"
android:background="@null"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" >
android:layout_alignParentBottom="true"
android:contentDescription="@string/add" >
</ImageButton>
</RelativeLayout>

45
app/src/main/res/layout/activity_main.xml
View File

@ -37,6 +37,7 @@
android:layout_below="@id/AoRList"
android:paddingTop="16dp"
android:paddingStart="3dp"
android:paddingEnd="0dp"
android:textSize="20sp"
android:textColor="@android:color/black"
android:text="@string/outgoing_call_to_dots" >
@ -79,7 +80,8 @@
android:layout_below="@id/uriRow"
android:padding="0dp"
android:background="@null"
android:src="@drawable/call_green" >
android:src="@drawable/call_green"
android:contentDescription="@string/call" >
</ImageButton>
<ImageButton
@ -91,7 +93,8 @@
android:background="@null"
android:src="@drawable/hangup"
android:clickable="false"
android:visibility="invisible" >
android:visibility="invisible"
android:contentDescription="@string/hangup" >
</ImageButton>
<ImageButton
@ -103,7 +106,8 @@
android:background="@null"
android:src="@drawable/call_green"
android:clickable="false"
android:visibility="invisible" >
android:visibility="invisible"
android:contentDescription="@string/answer" >
</ImageButton>
<ImageButton
@ -116,7 +120,8 @@
android:layout_marginStart="70dp"
android:src="@drawable/hangup"
android:clickable="false"
android:visibility="invisible" >
android:visibility="invisible"
android:contentDescription="@string/reject" >
</ImageButton>
<ImageButton
@ -129,7 +134,8 @@
android:background="@null"
android:layout_marginStart="70dp"
android:clickable="false"
android:visibility="invisible" >
android:visibility="invisible"
android:contentDescription="@string/hold" >
</ImageButton>
<EditText
@ -141,7 +147,8 @@
android:inputType="phone"
android:textSize="20sp"
android:hint="@string/dtmf"
android:visibility="invisible" >
android:visibility="invisible"
android:importantForAutofill="no" >
</EditText>
<ImageButton
@ -155,7 +162,8 @@
android:layout_marginTop="6dp"
android:background="@null"
android:clickable="false"
android:visibility="invisible" >
android:visibility="invisible"
android:contentDescription="@string/call_info" >
</ImageButton>
</RelativeLayout>
@ -171,7 +179,8 @@
android:layout_toStartOf="@id/contactsButton"
android:layout_marginEnd="10dp"
android:layout_alignParentBottom="true"
android:visibility="invisible" >
android:visibility="invisible"
android:contentDescription="@string/voicemail" >
</ImageButton>
<ImageButton
@ -182,7 +191,8 @@
android:src="@drawable/contacts"
android:layout_toStartOf="@id/messagesButton"
android:layout_marginEnd="10dp"
android:layout_alignParentBottom="true" >
android:layout_alignParentBottom="true"
android:contentDescription="@string/contacts" >
</ImageButton>
<ImageButton
@ -193,31 +203,34 @@
android:src="@drawable/messages"
android:layout_toStartOf="@id/callsButton"
android:layout_marginEnd="10dp"
android:layout_alignParentBottom="true" >
android:layout_alignParentBottom="true"
android:contentDescription="@string/messages" >
</ImageButton>
<ImageButton
android:id="@+id/callsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/dialpadButton"
android:layout_marginEnd="10dp"
android:layout_alignParentBottom="true"
android:padding="0dp"
android:background="@null"
android:src="@drawable/calls"
android:layout_toStartOf="@id/dialpadButton"
android:layout_marginEnd="10dp"
android:layout_alignParentBottom="true" >
android:contentDescription="@string/calls" >
</ImageButton>
<ImageButton
android:id="@+id/dialpadButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:src="@drawable/dialpad_off"
android:layout_marginEnd="10dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="2dp"
android:layout_alignParentEnd="true" >
android:layout_alignParentEnd="true"
android:background="@null"
android:src="@drawable/dialpad_off"
android:contentDescription="@string/dialpad" >
</ImageButton>
</RelativeLayout>

13
app/src/main/res/layout/call_notification.xml
View File

@ -16,15 +16,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="10dp"
android:paddingRight="5dp"
android:src="@drawable/baresip" />
android:paddingStart="10dp"
android:paddingEnd="5dp"
android:src="@drawable/baresip"
android:contentDescription="@string/app_name" />
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="15dp"
android:textSize="15sp"
android:textColor="#000000"
android:text="@string/app_name"
style = "@android:style/TextAppearance.Medium" />
@ -36,9 +37,9 @@
android:layout_height="wrap_content"
android:layout_below="@id/mainRow"
android:layout_marginTop="10dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="10dp"
android:textSize="15dp"
android:textSize="15sp"
style = "@android:style/TextAppearance.Medium" />
<Button android:id="@+id/answerButton"

2
app/src/main/res/layout/call_row.xml
View File

@ -26,6 +26,7 @@
android:textAlignment="gravity"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingStart="0dp"
android:paddingEnd="5dp"
android:textSize="18sp"
android:maxLines="1"
@ -47,6 +48,7 @@
android:layout_toStartOf="@id/time"
android:focusable="false"
android:paddingStart="5dp"
android:paddingEnd="0dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:textAlignment="gravity"

5
app/src/main/res/layout/contact_row.xml
View File

@ -15,7 +15,7 @@
</TextView>
<ImageButton
android:id="@+id/action"
android:id="@+id/edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
@ -25,7 +25,8 @@
android:layout_marginStart="10dp"
android:src="@drawable/edit"
android:background="@null"
android:scaleType="centerCrop" >
android:scaleType="centerCrop"
android:contentDescription="@string/edit" >
</ImageButton>
</RelativeLayout>

1
app/src/main/res/layout/password_dialog.xml
View File

@ -17,4 +17,5 @@
android:inputType="textPassword" />
</android.support.design.widget.TextInputLayout>
</FrameLayout>

32
app/src/main/res/layout/status_notification.xml
View File

@ -9,49 +9,59 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="10dp"
android:paddingRight="5dp"
android:src="@drawable/baresip" />
android:paddingStart="10dp"
android:paddingEnd="5dp"
android:src="@drawable/baresip"
android:contentDescription="@string/app_name" />
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="15dp"
android:textColor="#000000"
android:textSize="15sp"
android:textColor="@color/colorBaresip"
android:text="@string/app_name"
style = "@android:style/TextAppearance.Medium" />
style = "@android:style/TextAppearance.DeviceDefault.Small" />
<ImageView android:id="@+id/status0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="10dp" />
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:contentDescription="@string/status" />
<ImageView android:id="@+id/status1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="10dp" />
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:contentDescription="@string/status" />
<ImageView android:id="@+id/status2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="10dp" />
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:contentDescription="@string/status" />
<ImageView android:id="@+id/status3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="10dp" />
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:contentDescription="@string/status" />
<TextView android:id="@+id/etc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="14dp"
android:paddingLeft="5dp"
android:paddingStart="5dp"
android:paddingEnd="0dp"
android:text="@string/dots"
android:textColor="#000000"
style = "@android:style/TextAppearance.Medium" />

14
app/src/main/res/values/strings.xml
View File

@ -128,9 +128,11 @@
\'server:port\'. If server is an IPv6 address, the address must be written inside brackets [].
Factory default value is \'8.8.8.8:53,[2001:4860:4860::8888]:53\' pointing to public Google
DNS servers.</string>
<string name="_8_8_8_8_53">8.8.8.8:53</string>
<string name="opus_bit_rate">Opus Bit Rate</string>
<string name="opus_bit_rate_help">Average maximum bit rate used by Opus audio stream.
Valid value are 6000-510000. Factory default is 28000.</string>
<string name="_28000">28000</string>
<string name="ice_lite_mode">ICE Lite Mode</string>
<string name="ice_lite_mode_help">If checked, ICE Lite Mode is used.</string>
<string name="default_call_volume">Default Call Volume</string>
@ -148,6 +150,9 @@
<!-- Contacts Activity -->
<string name="contacts">Contacts</string>
<string name="contact_action_question">Do you want to call or send message to</string>
<string name="send_message">Send Message</string>
<string name="contact_delete_question">Do you want to delete contact</string>
<!-- Generic -->
<string name="alert">Alert</string>
@ -165,6 +170,9 @@
<string name="sip_uri">SIP URI</string>
<string name="add">Add</string>
<string name="delete">Delete</string>
<string name="edit">Edit</string>
<string name="send">Send</string>
<string name="status">Status</string>
<string name="dots">&#8230;</string>
<!-- Main Activity -->
@ -175,12 +183,18 @@
<string name="transferring_call_to_dots">Transferring call to &#8230;</string>
<string name="invalid_sip_uri">Invalid SIP URI</string>
<string name="callee">Callee</string>
<string name="call">Call</string>
<string name="hangup">Hangup</string>
<string name="hold">Hold</string>
<string name="dtmf">DTMF</string>
<string name="call_info">Call Info</string>
<string name="duration">Duration</string>
<string name="codecs">Codecs</string>
<string name="rate">Rate</string>
<string name="voicemail">Voicemail</string>
<string name="voicemail_messages">Voicemail Messages</string>
<string name="messages">Messages</string>
<string name="dialpad">Dialpad</string>
<string name="call_already_active">You already have an active call!</string>
<string name="start_failed">Baresip failed to start! Listen Address was reset.
Restart baresip.</string>