ui: add missing files and various cleanups
Issue: #78218
Change-Id: Ib22e6f4b28ab1f40be6f79c24c8870c45868f828
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
index d3ff53a..07d33fd 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
@@ -149,7 +149,7 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.newconv_option_menu, menu);
- SearchView searchView = (SearchView) menu.findItem(R.id.contact_search).getActionView();
+ SearchView searchView = (SearchView) menu.findItem(R.id.menu_contact_search).getActionView();
searchView.setOnQueryTextListener(ContactListFragment.this);
}
diff --git a/ring-android/app/src/main/res/anim/contact_fadein.xml b/ring-android/app/src/main/res/anim/contact_fadein.xml
new file mode 100644
index 0000000..18e4f8a
--- /dev/null
+++ b/ring-android/app/src/main/res/anim/contact_fadein.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <alpha
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:duration="@android:integer/config_mediumAnimTime"
+ android:repeatCount="0" />
+</set>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/drawable/textmsg_background.xml b/ring-android/app/src/main/res/drawable/textmsg_background.xml
new file mode 100644
index 0000000..151c9d7
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/textmsg_background.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <stroke
+ android:width="0dp"
+ android:color="@android:color/transparent" />
+
+ <solid android:color="#ffffff" />
+
+ <padding
+ android:left="1dp"
+ android:right="1dp"
+ android:top="1dp" />
+
+ <corners android:radius="5dp" />
+
+</shape>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_contact_list.xml b/ring-android/app/src/main/res/layout/frag_contact_list.xml
index f056e77..8c966d5 100644
--- a/ring-android/app/src/main/res/layout/frag_contact_list.xml
+++ b/ring-android/app/src/main/res/layout/frag_contact_list.xml
@@ -55,7 +55,7 @@
android:layout_gravity="center"
android:gravity="center"
android:text="@string/no_contact_found"
- android:textColor="@color/white"
+ android:textColor="@color/text_color_primary"
android:textSize="30sp" />
diff --git a/ring-android/app/src/main/res/layout/frag_contact_list_header.xml b/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
index d2ee4d8..8c1a347 100644
--- a/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
+++ b/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
@@ -7,7 +7,7 @@
android:orientation="vertical">
<include
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/item_contact"
android:layout_gravity="center_horizontal"
diff --git a/ring-android/app/src/main/res/layout/frag_history_detail.xml b/ring-android/app/src/main/res/layout/frag_history_detail.xml
index e20c288..a123a0b 100644
--- a/ring-android/app/src/main/res/layout/frag_history_detail.xml
+++ b/ring-android/app/src/main/res/layout/frag_history_detail.xml
@@ -38,18 +38,6 @@
android:textSize="18sp"/>
</LinearLayout>
- <LinearLayout
- android:id="@+id/contact_name_holder"
- android:layout_width="0dp"
- android:layout_height="50dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:background="#AAFFFFFF"
- android:orientation="vertical"
- android:padding="5dp">
-
- </LinearLayout>
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/menu/contact_list_menu.xml b/ring-android/app/src/main/res/menu/contact_list_menu.xml
deleted file mode 100644
index 6b76c03..0000000
--- a/ring-android/app/src/main/res/menu/contact_list_menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@+id/menu_search"
- android:icon="@drawable/ic_menu_search"
- android:orderInCategory="100"
- android:showAsAction="ifRoom"
- android:title="Search"/>
-
-</menu>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/menu/newconv_option_menu.xml b/ring-android/app/src/main/res/menu/newconv_option_menu.xml
index 05def4c..af70542 100644
--- a/ring-android/app/src/main/res/menu/newconv_option_menu.xml
+++ b/ring-android/app/src/main/res/menu/newconv_option_menu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/contact_search"
+ <item android:id="@+id/menu_contact_search"
android:title="Nom d'un contact ou numéro"
android:icon="@drawable/ic_search_white_24dp"
android:showAsAction="collapseActionView|ifRoom"