From f3e86cf582cce413eb0f860765dc22e9a7fa0b2c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 6 Apr 2018 23:20:14 +0200
Subject: [PATCH] display contact organization on the View Details screen

---
 .../activities/ViewContactActivity.kt         |   9 ++++++
 .../main/res/drawable-hdpi/ic_business.png    | Bin 0 -> 152 bytes
 .../main/res/drawable-xhdpi/ic_business.png   | Bin 0 -> 112 bytes
 .../main/res/drawable-xxhdpi/ic_business.png  | Bin 0 -> 119 bytes
 .../main/res/drawable-xxxhdpi/ic_business.png | Bin 0 -> 114 bytes
 .../main/res/layout/activity_view_contact.xml |  26 +++++++++++++++++-
 6 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_business.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_business.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_business.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_business.png

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
index 1b24de23..1d28a026 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
@@ -123,6 +123,7 @@ class ViewContactActivity : ContactActivity() {
         contact_event_image.applyColorFilter(textColor)
         contact_source_image.applyColorFilter(textColor)
         contact_notes_image.applyColorFilter(textColor)
+        contact_organization_image.applyColorFilter(textColor)
         contact_groups_image.applyColorFilter(textColor)
 
         contact_send_sms.setOnClickListener { trySendSMS() }
@@ -164,6 +165,7 @@ class ViewContactActivity : ContactActivity() {
         setupAddresses()
         setupEvents()
         setupNotes()
+        setupOrganization()
         setupGroups()
     }
 
@@ -251,6 +253,13 @@ class ViewContactActivity : ContactActivity() {
         contact_notes.beVisibleIf(notes.isNotEmpty())
     }
 
+    private fun setupOrganization() {
+        val organization = contact!!.organization
+        contact_organization.text = organization
+        contact_organization_image.beVisibleIf(organization.isNotEmpty())
+        contact_organization.beVisibleIf(organization.isNotEmpty())
+    }
+
     private fun setupGroups() {
         contact_groups_holder.removeAllViews()
         val groups = contact!!.groups
diff --git a/app/src/main/res/drawable-hdpi/ic_business.png b/app/src/main/res/drawable-hdpi/ic_business.png
new file mode 100644
index 0000000000000000000000000000000000000000..d10ebb766f4ba84a4f218de01c4c1fefb6368058
GIT binary patch
literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8yr+v}h{y4_Q#NujC~&y^E%|?^
zO{yutCOD=>m+#{Xn~sbEr5st8luH`70_RDJ-7IeR=w>U?lAqFbA!8OtY}wuuePwy~
zigRwR`<~XlX_0UC<*3^11Li`DJ&t^IZl27VztqatJ>vZ?pj8Z>u6{1-oD!M<!1Okc

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_business.png b/app/src/main/res/drawable-xhdpi/ic_business.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5630455a9759548446c804e92739f71bc0b4a68
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PU<QV=$!9HqJWWp*$B+uf
zWCgho|Nr;Te)Rmf?_c&N{s_$up%{^XgY0WWe7`&_Rlmr<aA$HV>r`%KU64_pu6{1-
HoD!M<2qPdk

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_business.png b/app/src/main/res/drawable-xxhdpi/ic_business.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dfc8dc527c94768b086c12846022573de69fdac
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc?O;?jv*C{
z$qQr?{{8>|pS>tj{>{vjX@A=rn3rr$SoUG^Q6}k+?L5~eY?;2OV3{NX!}eH~e_j*+
Q?FX6Y>FVdQ&MBb@0OOu0%K!iX

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_business.png b/app/src/main/res/drawable-xxxhdpi/ic_business.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9aea72ceb49bc4581d8223d240c223cbbddb6a1
GIT binary patch
literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc^0Yl&978G?
zlO?V^u;;kY%-mA)@BpK)C5LzBSw=>M`P1eE{-1DiVRV)B83u-pQ}+cJ@)S#e4D)pL
Kb6Mw<&;$ThS0Lm7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_view_contact.xml b/app/src/main/res/layout/activity_view_contact.xml
index 4b081639..f7e2fb2f 100644
--- a/app/src/main/res/layout/activity_view_contact.xml
+++ b/app/src/main/res/layout/activity_view_contact.xml
@@ -239,6 +239,30 @@
             android:paddingTop="@dimen/normal_margin"
             android:textSize="@dimen/bigger_text_size"/>
 
+        <ImageView
+            android:id="@+id/contact_organization_image"
+            android:layout_width="@dimen/contact_icons_size"
+            android:layout_height="@dimen/contact_icons_size"
+            android:layout_alignTop="@+id/contact_organization"
+            android:paddingBottom="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
+            android:paddingRight="@dimen/small_margin"
+            android:paddingTop="@dimen/medium_margin"
+            android:src="@drawable/ic_business"/>
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/contact_organization"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/contact_notes"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/contact_organization_image"
+            android:lineSpacingExtra="@dimen/medium_margin"
+            android:paddingBottom="@dimen/normal_margin"
+            android:paddingLeft="@dimen/small_margin"
+            android:paddingTop="@dimen/normal_margin"
+            android:textSize="@dimen/bigger_text_size"/>
+
         <ImageView
             android:id="@+id/contact_groups_image"
             android:layout_width="@dimen/contact_icons_size"
@@ -254,7 +278,7 @@
             android:id="@+id/contact_groups_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_notes"
+            android:layout_below="@+id/contact_organization"
             android:layout_toRightOf="@+id/contact_name_image"
             android:orientation="vertical"
             android:paddingLeft="@dimen/small_margin"/>