From 6a486c890020bd916cda279258a9707df192f158 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Fri, 19 Feb 2021 14:24:25 +0100
Subject: [PATCH 1/2] decrease Lint Warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
.../res/drawable/ic_close_grey600_24dp.xml | 27 ------
app/src/main/res/layout/dialog_standard.xml | 85 ------------------
.../res/layout/dialog_standard_vertical.xml | 90 -------------------
app/src/main/res/layout/emoji_view.xml | 43 ---------
app/src/main/res/values-night/colors.xml | 3 -
app/src/main/res/values/colors.xml | 7 --
app/src/main/res/values/dimens.xml | 2 -
7 files changed, 257 deletions(-)
delete mode 100644 app/src/main/res/drawable/ic_close_grey600_24dp.xml
delete mode 100644 app/src/main/res/layout/dialog_standard.xml
delete mode 100644 app/src/main/res/layout/dialog_standard_vertical.xml
delete mode 100644 app/src/main/res/layout/emoji_view.xml
diff --git a/app/src/main/res/drawable/ic_close_grey600_24dp.xml b/app/src/main/res/drawable/ic_close_grey600_24dp.xml
deleted file mode 100644
index 38b94fe27..000000000
--- a/app/src/main/res/drawable/ic_close_grey600_24dp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ Nextcloud Talk application
- ~
- ~ @author Mario Danic
- ~ Copyright (C) 2017-2019 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/>.
- -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="#757575" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
-</vector>
diff --git a/app/src/main/res/layout/dialog_standard.xml b/app/src/main/res/layout/dialog_standard.xml
deleted file mode 100644
index e492c92d6..000000000
--- a/app/src/main/res/layout/dialog_standard.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Nextcloud Talk application
- ~
- ~ @author Mario Danic
- ~ Copyright (C) 2017-2019 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/>.
- -->
-
-<!--
- Adapted to use TextButton style and Material buttons from LovelyDialog
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="end"
- android:orientation="horizontal">
-
- <Space
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ld_btn_neutral"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ld_btn_no"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ld_btn_yes"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone" />
-
- </LinearLayout>
-
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <Space
- android:layout_width="wrap_content"
- android:layout_height="12dp" />
-
- <include layout="@layout/view_title_and_message" />
-
- </LinearLayout>
- </ScrollView>
-
- <include layout="@layout/view_color_area" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_standard_vertical.xml b/app/src/main/res/layout/dialog_standard_vertical.xml
deleted file mode 100644
index 01700ffd7..000000000
--- a/app/src/main/res/layout/dialog_standard_vertical.xml
+++ /dev/null
@@ -1,90 +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/>.
- -->
-
-<!--
- Adapted to use TextButton style and Material buttons from LovelyDialog
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <Space
- android:layout_width="wrap_content"
- android:layout_height="12dp" />
-
- <include layout="@layout/view_title_and_message" />
-
- </LinearLayout>
- </ScrollView>
-
- <Space
- android:layout_width="wrap_content"
- android:layout_height="12dp" />
-
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ld_btn_no"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:gravity="end|center_vertical"
- android:paddingLeft="@dimen/ld_side_margin"
- android:paddingRight="@dimen/ld_side_margin"
- android:visibility="gone" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ld_btn_neutral"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:gravity="end|center_vertical"
- android:paddingLeft="@dimen/ld_side_margin"
- android:paddingRight="@dimen/ld_side_margin"
- android:visibility="gone" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ld_btn_yes"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:gravity="end|center_vertical"
- android:paddingLeft="@dimen/ld_side_margin"
- android:paddingRight="@dimen/ld_side_margin"
- android:visibility="gone" />
-
- <include layout="@layout/view_color_area" />
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/emoji_view.xml b/app/src/main/res/layout/emoji_view.xml
deleted file mode 100644
index f1e87f047..000000000
--- a/app/src/main/res/layout/emoji_view.xml
+++ /dev/null
@@ -1,43 +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/>.
- -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <LinearLayout
- android:id="@+id/emojiViewTab"
- android:layout_width="match_parent"
- android:layout_height="36dp"
- android:layout_alignParentBottom="true"
- android:orientation="horizontal" />
-
- <View
- android:id="@+id/emojiViewDivider"
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_above="@id/emojiViewTab" />
-
- <androidx.viewpager.widget.ViewPager
- android:id="@+id/emojiViewPager"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/emojiViewDivider" />
-</RelativeLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 7716f5ed2..b4f70325c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -36,7 +36,4 @@
<color name="bg_message_list_incoming_bubble_deleted">#66484848</color>
<color name="textColorMaxContrast">#8c8c8c</color>
-
- <color name="emoji_background">#313031</color>
- <color name="emoji_divider">#15FFFFFF</color>
</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ea4d45a7e..a7ce271d9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,9 +32,6 @@
<color name="conversation_item_header">#000000</color>
<color name="conversation_unread_bubble">#FFFFFF</color>
- <color name="nc_incoming_text_mention_you">#C98879</color>
- <color name="nc_incoming_text_mention_others">#37505D</color>
-
<color name="nc_darkRed">#D32F2F</color>
<color name="nc_darkGreen">#006400</color>
<color name="nc_white_color">@color/per70white</color>
@@ -44,14 +41,10 @@
<color name="controller_call_incomingCallTextView">#E9FFFFFF</color>
<color name="grey950">#111111</color>
<color name="textColorMaxContrast">#767676</color>
- <color name="whiteHalfTransparent">#7Fffffff</color>
<!-- Emoji list in chat window -->
- <color name="emoji_background">#eceff1</color>
<color name="emoji_icons">#61000000</color>
- <color name="emoji_divider">#15000000</color>
- <color name="fg_default">#000000</color>
<color name="fg_inverse">#FFFFFF</color>
<color name="bg_default">#FFFFFF</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c2fba98f4..60c27fda3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,6 @@
<dimen name="item_height">72dp</dimen>
<dimen name="small_item_height">48dp</dimen>
- <dimen name="smaller_item_height">24dp</dimen>
<dimen name="rv_item_view_height">48dp</dimen>
<!-- Custom transition dimensions -->
@@ -39,7 +38,6 @@
<dimen name="message_bubble_corners_radius">6dp</dimen>
<dimen name="message_bubble_corners_padding">8dp</dimen>
- <dimen name="minimum_file_preview_size">48dp</dimen>
<dimen name="maximum_file_preview_size">192dp</dimen>
<dimen name="large_preview_dimension">80dp</dimen>
From 12ad5ad63a3da2a7b9c4df8923c8b6d9904b81ff Mon Sep 17 00:00:00 2001
From: drone <noreply@drone>
Date: Fri, 19 Feb 2021 13:39:56 +0000
Subject: [PATCH 2/2] Drone: update Lint results to reflect reduced
error/warning count [skip ci]
Signed-off-by: drone <noreply@drone>
---
scripts/analysis/lint-results.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index c2b0654c8..598f62b50 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE
- <span class="mdl-layout-title">Lint Report: 3 errors and 143 warnings</span>
+ <span class="mdl-layout-title">Lint Report: 3 errors and 135 warnings</span>