From cc7cfd4d1f1b7239685c5ef72ffb4bd8b987deca Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 6 Dec 2018 01:25:57 +0100
Subject: [PATCH] Fix typos

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../bottomsheet/EntryMenuController.java      |  6 ++---
 .../main/res/layout/rv_item_empty_footer.xml  | 26 -------------------
 .../res/values/ic_launcher_background.xml     |  4 ---
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 app/src/main/res/layout/rv_item_empty_footer.xml
 delete mode 100644 app/src/main/res/values/ic_launcher_background.xml

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
index 2c5d93b3a..7edc9fd8f 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
@@ -220,7 +220,7 @@ public class EntryMenuController extends BaseController {
                         } else {
                             if (proceedButton.isEnabled()) {
                                 proceedButton.setEnabled(false);
-                                proceedButton.setAlpha(0.7f);
+                                proceedButton.setAlpha(0.38f);
                             }
                             textFieldBoxes.setError(getResources().getString(R.string.nc_call_name_is_same),
                                     true);
@@ -242,7 +242,7 @@ public class EntryMenuController extends BaseController {
                     } else {
                         if (proceedButton.isEnabled()) {
                             proceedButton.setEnabled(false);
-                            proceedButton.setAlpha(0.7f);
+                            proceedButton.setAlpha(0.38f);
                         }
                         textFieldBoxes.setError(getResources().getString(R.string.nc_wrong_link),
                                 true);
@@ -250,7 +250,7 @@ public class EntryMenuController extends BaseController {
                 } else {
                     if (proceedButton.isEnabled()) {
                         proceedButton.setEnabled(false);
-                        proceedButton.setAlpha(0.7f);
+                        proceedButton.setAlpha(0.38f);
                     }
                 }
             }
diff --git a/app/src/main/res/layout/rv_item_empty_footer.xml b/app/src/main/res/layout/rv_item_empty_footer.xml
deleted file mode 100644
index 4ea256c53..000000000
--- a/app/src/main/res/layout/rv_item_empty_footer.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Talk application
-  ~
-  ~ @author Mario Danic
-  ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:orientation="vertical">
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index d65c8208e..000000000
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">@color/colorPrimary</color>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43a8abd75..2d4db8ad4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -215,6 +215,7 @@ Find Nextcloud on https://nextcloud.com</string>
     <string name="nc_date_header_today">Today</string>
     <string name="nc_conversation_menu_voice_call">Voice call</string>
     <string name="nc_conversation_menu_video_call">Video call</string>
+    <string name="nc_conversation_menu_conversation_info">Conversation info</string>
     <string name="nc_new_messages">New messages</string>
     <string name="nc_no_messages_yet">No messages yet</string>
     <string name="nc_chat_you">You</string>
@@ -246,5 +247,4 @@ Find Nextcloud on https://nextcloud.com</string>
     <string name="nc_user">User</string>
     <string name="nc_guest">Guest</string>
     <string name="nc_following_link">User following a public link</string>
-
 </resources>