fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-04-15 18:37:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #142, make address field multiline

Browse Source
This commit is contained in:
tibbi 2018-04-18 11:04:34 +02:00
parent 05f8bf71cf
commit e572ecb678
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt
View File

@ -55,7 +55,7 @@ class VcfExporter {
contact.addresses.forEach { contact.addresses.forEach {
val type = getAddressTypeLabel(it.type) val type = getAddressTypeLabel(it.type)
val delimiterType = if (type.isEmpty()) "" else ";$type" val delimiterType = if (type.isEmpty()) "" else ";$type"
out.writeLn("$ADR$delimiterType:;;${it.value};;;;") out.writeLn("$ADR$delimiterType:;;${it.value.replace("\n", "\\n")};;;;")
} }
contact.events.forEach { contact.events.forEach {

2
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt
View File

@ -187,7 +187,7 @@ class VcfImporter(val activity: SimpleActivity) {
val type = getAddressTypeId(rawType.toUpperCase()) val type = getAddressTypeId(rawType.toUpperCase())
val addresses = addressParts[1].split(";") val addresses = addressParts[1].split(";")
if (addresses.size == 7) { if (addresses.size == 7) {
curAddresses.add(Address(addresses[2], type)) curAddresses.add(Address(addresses[2].replace("\\n", "\n"), type))
} }
} }

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

@ -13,10 +13,7 @@
android:layout_toLeftOf="@+id/contact_address_type" android:layout_toLeftOf="@+id/contact_address_type"
android:layout_toStartOf="@+id/contact_address_type" android:layout_toStartOf="@+id/contact_address_type"
android:hint="@string/address" android:hint="@string/address"
android:inputType="textCapWords" android:inputType="textCapWords|textMultiLine"
android:lines="1"
android:maxLines="1"
android:singleLine="true"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textSize="@dimen/bigger_text_size"/> android:textSize="@dimen/bigger_text_size"/>

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

@ -15,9 +15,6 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/contact_address_type" android:layout_toLeftOf="@+id/contact_address_type"
android:layout_toStartOf="@+id/contact_address_type" android:layout_toStartOf="@+id/contact_address_type"
android:lines="1"
android:maxLines="1"
android:singleLine="true"
android:textSize="@dimen/bigger_text_size"/> android:textSize="@dimen/bigger_text_size"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView