From 0c9bbc747f85828383a6c21b1a1a64a70623a272 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 15 Apr 2019 10:31:46 +0200
Subject: [PATCH] Fixed issue in lanscape in account settings + improved
 landscape history detail view

---
 .../java/org/linphone/LinphoneActivity.java   |   2 +-
 .../main/res/layout-land/history_detail.xml   | 174 +++++++++++++++++
 .../res/layout-sw533dp/history_detail.xml     | 176 ++++++++++++++++++
 app/src/main/res/layout/history_detail.xml    |   5 +-
 4 files changed, 354 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/layout-land/history_detail.xml
 create mode 100644 app/src/main/res/layout-sw533dp/history_detail.xml

diff --git a/app/src/main/java/org/linphone/LinphoneActivity.java b/app/src/main/java/org/linphone/LinphoneActivity.java
index 8063138f7..986b8c1cd 100644
--- a/app/src/main/java/org/linphone/LinphoneActivity.java
+++ b/app/src/main/java/org/linphone/LinphoneActivity.java
@@ -1237,8 +1237,8 @@ public class LinphoneActivity extends LinphoneGenericActivity
                 break;
             case SETTINGS:
             case ACCOUNT_SETTINGS:
-                hideTabBar(hideBottomBar);
             case SETTINGS_SUBLEVEL:
+                hideTabBar(hideBottomBar);
                 if (customTitle == null) {
                     showTopBarWithTitle(getString(R.string.settings));
                 } else {
diff --git a/app/src/main/res/layout-land/history_detail.xml b/app/src/main/res/layout-land/history_detail.xml
new file mode 100644
index 000000000..80a69d451
--- /dev/null
+++ b/app/src/main/res/layout-land/history_detail.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
+
+    <LinearLayout
+        android:id="@+id/top_bar"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_alignParentTop="true"
+        android:background="?attr/lighToolbarBackgroundColor"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/back"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.2"
+            android:background="?attr/button_background_drawable"
+            android:contentDescription="@string/content_description_back"
+            android:padding="18dp"
+            android:src="@drawable/back" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6" />
+
+        <ImageView
+            android:id="@+id/add_contact"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.2"
+            android:background="?attr/button_background_drawable"
+            android:contentDescription="@string/content_description_add_contact"
+            android:padding="15dp"
+            android:src="@drawable/contact_add" />
+
+        <ImageView
+            android:id="@+id/goto_contact"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.2"
+            android:background="?attr/button_background_drawable"
+            android:contentDescription="@string/content_description_contacts"
+            android:padding="15dp"
+            android:src="@drawable/contact"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/top_bar"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="20dp">
+
+            <RelativeLayout
+                android:id="@+id/avatar_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+
+                <include layout="@layout/contact_avatar_100"/>
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/contact_name"
+                style="@style/big_contact_name_font"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/contact_address"
+                style="@style/sip_uri_font"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/call"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/round_orange_button_background"
+                    android:contentDescription="@string/content_description_call"
+                    android:src="@drawable/call_start_default" />
+
+                <ImageView
+                    android:id="@+id/chat"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/round_orange_button_background"
+                    android:contentDescription="@string/content_description_chat"
+                    android:src="@drawable/chat_start_default" />
+
+                <RelativeLayout
+                    android:id="@+id/chat_secured"
+                    android:layout_width="65dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp">
+
+                    <ImageView
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_alignParentLeft="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/round_orange_button_background"
+                        android:contentDescription="@string/content_description_chat"
+                        android:src="@drawable/chat_start_default" />
+
+                    <ImageView
+                        android:id="@+id/security_level"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentRight="true"
+                        android:src="@drawable/security_toogle_icon_green" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/assistant_input_field_header_font"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="5dp"
+                android:text="@string/calls"
+                android:textAllCaps="true" />
+
+            <ListView
+                android:id="@+id/logs_list"
+                android:cacheColorHint="@color/transparent_color"
+                android:divider="@android:color/transparent"
+                android:dividerHeight="0dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <include
+        android:id="@+id/waitScreen"
+        layout="@layout/wait_layout" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw533dp/history_detail.xml b/app/src/main/res/layout-sw533dp/history_detail.xml
new file mode 100644
index 000000000..5a0ce20af
--- /dev/null
+++ b/app/src/main/res/layout-sw533dp/history_detail.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:background="?attr/lighToolbarBackgroundColor"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/back"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:background="?attr/button_background_drawable"
+                android:contentDescription="@string/content_description_back"
+                android:padding="18dp"
+                android:src="@drawable/back" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.6" />
+
+            <ImageView
+                android:id="@+id/add_contact"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:background="?attr/button_background_drawable"
+                android:contentDescription="@string/content_description_add_contact"
+                android:padding="15dp"
+                android:src="@drawable/contact_add" />
+
+            <ImageView
+                android:id="@+id/goto_contact"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:background="?attr/button_background_drawable"
+                android:contentDescription="@string/content_description_contacts"
+                android:padding="15dp"
+                android:src="@drawable/contact"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:paddingTop="20dp"
+            android:paddingBottom="5dp">
+
+            <RelativeLayout
+                android:id="@+id/avatar_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+
+                <include layout="@layout/contact_avatar_100"/>
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/contact_name"
+                style="@style/big_contact_name_font"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal" />
+
+            <TextView
+                android:id="@+id/contact_address"
+                style="@style/sip_uri_font"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/call"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/round_orange_button_background"
+                    android:contentDescription="@string/content_description_call"
+                    android:src="@drawable/call_start_default" />
+
+                <ImageView
+                    android:id="@+id/chat"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/round_orange_button_background"
+                    android:contentDescription="@string/content_description_chat"
+                    android:src="@drawable/chat_start_default" />
+
+                <RelativeLayout
+                    android:id="@+id/chat_secured"
+                    android:layout_width="65dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp">
+
+                    <ImageView
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_alignParentLeft="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/round_orange_button_background"
+                        android:contentDescription="@string/content_description_chat"
+                        android:src="@drawable/chat_start_default" />
+
+                    <ImageView
+                        android:id="@+id/security_level"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentRight="true"
+                        android:src="@drawable/security_toogle_icon_green" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="wrap_content"
+                    android:layout_height="1dp"
+                    android:background="?attr/dividerColor" />
+
+                <TextView
+                    style="@style/assistant_input_field_header_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/calls"
+                    android:textAllCaps="true" />
+
+                <ListView
+                    android:id="@+id/logs_list"
+                    android:cacheColorHint="@color/transparent_color"
+                    android:divider="@android:color/transparent"
+                    android:dividerHeight="0dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <include
+        android:id="@+id/waitScreen"
+        layout="@layout/wait_layout" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml
index 016f1ae3a..5a0ce20af 100644
--- a/app/src/main/res/layout/history_detail.xml
+++ b/app/src/main/res/layout/history_detail.xml
@@ -59,7 +59,8 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="vertical"
-            android:padding="20dp">
+            android:paddingTop="20dp"
+            android:paddingBottom="5dp">
 
             <RelativeLayout
                 android:id="@+id/avatar_layout"
@@ -150,7 +151,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginTop="2dp"
+                    android:layout_marginTop="5dp"
                     android:text="@string/calls"
                     android:textAllCaps="true" />