From e6cd92a663ba2f8ae572c901b359ce0f42db5900 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 4 Jan 2015 17:53:06 +0100 Subject: added higher auto accept file sizes also changed labeling to MiB and KiB --- src/main/res/values/arrays.xml | 70 ++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 33 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 4acc9e62..0fc55776 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -1,39 +1,43 @@ - - Mobile - Phone - Tablet - Conversations - Android - - - never - 256 KB - 512 KB - 1 MB - - - 0 - 262144 - 524288 - 1048576 - - - 30 minutes - 1 hour - 2 hours - 8 hours - until further notice - + + Mobile + Phone + Tablet + Conversations + Android + + + never + 256 KiB + 512 KiB + 1 MiB + 5 MiB + 10 MiB + + + 0 + 262144 + 524288 + 1048576 + 5242880 + 10485760 + + + 30 minutes + 1 hour + 2 hours + 8 hours + until further notice + - - 1800 - 3600 - 7200 - 28800 - -1 - + + 1800 + 3600 + 7200 + 28800 + -1 + -- cgit v1.2.3 From bdb335e6b08d35a23468ca1d5730330c520a6a90 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 5 Jan 2015 15:06:39 +0100 Subject: Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role --- src/main/res/values/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 45174cd8..bb358610 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -406,4 +406,9 @@ Enable all accounts Disable all accounts Perform action with + No affiliation + No role + Outcast + Member + Advanced mode -- cgit v1.2.3 From 45bb59dba8850d67025a83244a80a1d69d59276b Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Tue, 6 Jan 2015 21:37:49 -0500 Subject: Add materials theme --- src/main/res/values/colors.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 908b8b89..c21650a5 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ #ff259b24 #ff0a7e07 + #ff0091ea #de000000 #8a000000 #fffafafa -- cgit v1.2.3 From ef525fb10e672b23219fdf180d310de9f6ce59d3 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 7 Jan 2015 15:03:29 +0100 Subject: basic affiliation changes in muc --- src/main/res/values/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index bb358610..d78e135a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -411,4 +411,10 @@ Outcast Member Advanced mode + Grant membership + Remove membership + Grant admin privileges + Remove admin privileges + Remove from room + Could not change affiliation -- cgit v1.2.3 From 8d655f445a37acff288e39ec237395d303b7c3a2 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 7 Jan 2015 18:34:24 +0100 Subject: more muc options * show invite button only with admin privileges or on public conferences * Offer to ban user in public conferences. Thanks to @betheg for the awesome ground work for this --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d78e135a..c8e84d75 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -417,4 +417,7 @@ Remove admin privileges Remove from room Could not change affiliation + Ban user from conference + You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever. + Ban now -- cgit v1.2.3 From 061de5205e198eac51cf54af5fd9b2e4faebe4d2 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 8 Jan 2015 00:23:26 +0100 Subject: some clean ups for affiliation change context menu --- src/main/res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c8e84d75..651fa234 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -412,12 +412,12 @@ Member Advanced mode Grant membership - Remove membership + Revoke membership Grant admin privileges - Remove admin privileges - Remove from room + Revoke admin privileges + Remove from conference Could not change affiliation - Ban user from conference + Ban from conference You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever. Ban now -- cgit v1.2.3 From f8aa1bfec4df8cc7e34eae537f68ab45ed62756c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 8 Jan 2015 01:23:53 +0100 Subject: kick after ban --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 651fa234..bbac0c7c 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -420,4 +420,5 @@ Ban from conference You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever. Ban now + Could not change role -- cgit v1.2.3 From a9159568b9aca24563a3b8c732b257d246e33a1a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 8 Jan 2015 21:29:26 +0100 Subject: allow for very basic muc configuration --- src/main/res/values/strings.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index bbac0c7c..fdc211e4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -416,9 +416,16 @@ Grant admin privileges Revoke admin privileges Remove from conference - Could not change affiliation + Could not change affiliation of %s Ban from conference You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever. Ban now - Could not change role + Could not change role of %s + This is a publicly accessible conference + This is a private, members only conference + Conference options + Private (Members only) + Non-anonymous + Modified conference options! + Could not modify conference options -- cgit v1.2.3 From 734a9934a3f5135c512159ca862a9d89ce0ecb7b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 9 Jan 2015 02:06:03 +0100 Subject: make project translatable via transifex --- src/main/res/values/arrays.xml | 12 ++++++------ src/main/res/values/strings.xml | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 0fc55776..c413a3c4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -9,7 +9,7 @@ Android - never + @string/never 256 KiB 512 KiB 1 MiB @@ -25,11 +25,11 @@ 10485760 - 30 minutes - 1 hour - 2 hours - 8 hours - until further notice + @string/thirty_minutes + @string/one_hour + @string/two_hours + @string/eight_hours + @string/until_further_notice diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index fdc211e4..9cb60cf8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -428,4 +428,10 @@ Non-anonymous Modified conference options! Could not modify conference options + Never + 30 minutes + 1 hour + 2 hours + 8 hours + Until further notice -- cgit v1.2.3 From 06eae476ee7e19029fe1ac28eae75fdcc1d4d1e6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 9 Jan 2015 19:23:26 +0100 Subject: Introduced expert options to control enter-is-send (default == off) --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9cb60cf8..31f4dbea 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -434,4 +434,7 @@ 2 hours 8 hours Until further notice + Input options + Enter is send + Use enter key to send message -- cgit v1.2.3 From 0aa50cb5a1f72e65d5b4a01aa4da3f1454d51a51 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 11 Jan 2015 01:01:33 +0100 Subject: shortened some string --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 31f4dbea..e7b7d8bf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -421,8 +421,8 @@ You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever. Ban now Could not change role of %s - This is a publicly accessible conference - This is a private, members only conference + Publicly accessible conference + Private, members only conference Conference options Private (Members only) Non-anonymous -- cgit v1.2.3 From 77e4e1c2acfffcb64d0538c00b087462d15a4bbf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 12 Jan 2015 16:09:39 +0100 Subject: reworked message preview / message meta information (ie file offered, received * file) fixed #837 --- src/main/res/values/strings.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e7b7d8bf..cdf5d438 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -362,13 +362,12 @@ Keep service in foreground Prevents the operating system from killing your connection Choose file - Receiving %1$s file (%2$d%% completed) - Download %s file - Open %s file + Receiving %1$s (%2$d%% completed) + Download %s + Open %s sending (%1$d%% completed) Preparing file for transmission - File offered for download - %s file + %s offered for download Cancel transmission file transmission failed The file has been deleted @@ -437,4 +436,8 @@ Input options Enter is send Use enter key to send message + audio file + video file + PDF document + Received %s -- cgit v1.2.3 From 8d3323e384746acfad563d9389529b0802787261 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 12 Jan 2015 16:42:20 +0100 Subject: context menu for files and offered files. fixed #848 fixed #849 --- src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cdf5d438..7db008ea 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -47,7 +47,7 @@ Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed. Register new account on server Change password on server - Share with + Share with… Start Conversation Invite Contact Contacts @@ -328,7 +328,6 @@ Check image file size Message options Copy text - Share image Copy original URL Send again Image URL -- cgit v1.2.3 From 7d2a9624b56c0222e54a77b2b8b071ae9adde561 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 13 Jan 2015 11:52:41 +0100 Subject: make use of different dimensions for different screen sizes --- src/main/res/values/dimens.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 47c82246..79e920e9 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -1,5 +1,7 @@ - 16dp - 16dp + 8dp + 8dp + 16dp + 288dp -- cgit v1.2.3 From 548a585b2c4af9b4c2a98faabb8855fcb260daf2 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 14 Jan 2015 12:20:02 -0500 Subject: Harden the TLS connection cipher suites --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7db008ea..54e81a2d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -274,7 +274,7 @@ Don’t save encrypted messages Warning: This could lead to message loss Enable legacy SSL - Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure. + Enables legacy SSLv3 support and insecure SSL ciphers. Expert options Please be careful with these About Conversations -- cgit v1.2.3 From 0a96bec3c1d65c0d3da22511f3b92a21fd94ad0f Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 14 Jan 2015 15:28:27 -0500 Subject: Add option to swap enter/emoticon key --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7db008ea..6454981f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -435,6 +435,8 @@ Input options Enter is send Use enter key to send message + Show enter key + Change the emoticons key to an enter key audio file video file PDF document -- cgit v1.2.3 From 994c9495bad07fd7307ea85986a7766adb15cf84 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 15 Jan 2015 16:17:55 +0100 Subject: added dedicated button to disable foreground service in perma notification --- src/main/res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 54ab2c50..883a41e7 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -357,7 +357,6 @@ Contact requested SMP verification No valid OTR session has been found! Conversations - Touch to disable foreground service Keep service in foreground Prevents the operating system from killing your connection Choose file @@ -441,4 +440,6 @@ video file PDF document Received %s + Disable foreground service + Touch to open Conversations -- cgit v1.2.3 From c0993a9acb7be045d75e1c1dcc4c0fafc879a31e Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 15 Jan 2015 16:26:46 +0100 Subject: show toast when avatar has been published - fixed #874 --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 883a41e7..f35b59ca 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -442,4 +442,5 @@ Received %s Disable foreground service Touch to open Conversations + Avatar has been published! -- cgit v1.2.3 From edd58f19b46340f3c9e2182441c9f749754cfa5c Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Fri, 16 Jan 2015 00:36:11 -0500 Subject: Add download button on notification if applicable --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f35b59ca..e6776a60 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -85,6 +85,7 @@ Send OpenPGP encrypted message Your nickname has been changed Download Image + Download File Image file offered for download Send unencrypted Decryption failed. Maybe you don’t have the proper private key. -- cgit v1.2.3 From dfc1cea882b33c7bf27bca5a349377b6ed966a75 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sat, 17 Jan 2015 09:10:33 -0500 Subject: Correct the download file string on notifications Fixes #896 --- src/main/res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e6776a60..fb6878ce 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -85,7 +85,6 @@ Send OpenPGP encrypted message Your nickname has been changed Download Image - Download File Image file offered for download Send unencrypted Decryption failed. Maybe you don’t have the proper private key. @@ -439,9 +438,10 @@ Change the emoticons key to an enter key audio file video file + image file PDF document Received %s - Disable foreground service - Touch to open Conversations - Avatar has been published! + Disable foreground service + Touch to open Conversations + Avatar has been published! -- cgit v1.2.3 From 83c806a774a09d54a0ef84ec5400c348256ff03b Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sat, 17 Jan 2015 20:53:25 -0500 Subject: Fix string substitutions with unknown filetypes --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index fb6878ce..e9699745 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -362,6 +362,7 @@ Choose file Receiving %1$s (%2$d%% completed) Download %s + file Open %s sending (%1$d%% completed) Preparing file for transmission -- cgit v1.2.3 From ae16439bd6f0fb87848ee56795af75d3cce6a693 Mon Sep 17 00:00:00 2001 From: Christian S Date: Sun, 18 Jan 2015 11:12:38 +0100 Subject: Added new file type names for file transfers - apk - vcard --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index fb6878ce..fedbe73a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -440,6 +440,8 @@ video file image file PDF document + Android App + Contact Received %s Disable foreground service Touch to open Conversations -- cgit v1.2.3 From d58fadd05f303c594c05fca8307e0ac38425b817 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 18 Jan 2015 13:00:57 +0100 Subject: use same helper methods for images and files --- src/main/res/values/strings.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8baf794a..c50355ed 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -72,7 +72,6 @@ Add contact delivery failed rejected - Receiving image file (%1$d%%) Preparing image for transmission Clear history Clear Conversation History @@ -85,7 +84,6 @@ Send OpenPGP encrypted message Your nickname has been changed Download Image - Image file offered for download Send unencrypted Decryption failed. Maybe you don’t have the proper private key. OpenKeychain @@ -99,8 +97,6 @@ No OpenPGP Keys found Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP. Encrypted message received. Touch to view and decrypt. - Encrypted image received. Touch to view and decrypt. - Image received. Touch to view General XMPP resource The name this client identifies itself with @@ -437,9 +433,9 @@ Use enter key to send message Show enter key Change the emoticons key to an enter key - audio file - video file - image file + audio + video + image PDF document Android App Contact -- cgit v1.2.3 From 149a6716b8a5d4afe61e8a9c257a0d551a6d0e3d Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 18 Jan 2015 20:26:22 +0100 Subject: proper desc for offering and sending images in conversations overview --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c50355ed..2dac29da 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -443,4 +443,6 @@ Disable foreground service Touch to open Conversations Avatar has been published! + Sending %s + Offering %s -- cgit v1.2.3 From 503237087ffc5585876dfdb96ef167960bef0f15 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sat, 17 Jan 2015 13:40:15 -0500 Subject: Remove legacy SSL support --- src/main/res/values/strings.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2dac29da..dc4c1bdb 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -269,8 +269,6 @@ Always send messages encrypted (except for conferences) Don’t save encrypted messages Warning: This could lead to message loss - Enable legacy SSL - Enables legacy SSLv3 support and insecure SSL ciphers. Expert options Please be careful with these About Conversations -- cgit v1.2.3 From 4e50098e319b9ccd65801acf1774bc6212b75621 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 21 Jan 2015 17:24:02 +0100 Subject: show checkbox to hide offline contacts --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index dc4c1bdb..3d3d69a3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -443,4 +443,5 @@ Avatar has been published! Sending %s Offering %s + Hide offline -- cgit v1.2.3 From 48604a66201e0c0f403ba1576e35833c7407a7d0 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 21 Jan 2015 23:00:35 -0500 Subject: Use Material Design Icons on API 21+ --- src/main/res/values/attrs.xml | 20 ++++++++++++++++++++ src/main/res/values/strings.xml | 1 + src/main/res/values/themes.xml | 21 +++++++++++++++++++++ 3 files changed, 42 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 2354a5e8..e314f752 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,4 +5,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3d3d69a3..ae8dcd67 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -296,6 +296,7 @@ \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) + \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) Quiet Hours Start time diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index fa7973d2..80f2bfe6 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -8,6 +8,27 @@ 12sp 14sp 20sp + + @drawable/ic_action_add_group + @drawable/ic_action_add_person + @drawable/ic_action_cancel + @drawable/ic_action_chat + @drawable/ic_action_copy + @drawable/ic_action_discard + @drawable/ic_action_download + @drawable/ic_action_edit + @drawable/ic_action_edit_dark + + @drawable/ic_action_group + @drawable/ic_action_new + @drawable/ic_action_new_attachment + @drawable/ic_action_not_secure + @drawable/ic_action_refresh + @drawable/ic_action_remove + @drawable/ic_action_search + @drawable/ic_action_secure + @drawable/ic_action_settings + @drawable/ic_stat_communication_import_export