Merge branch 'master' into add-simple-characters

app/src/main/res/layout/activity_settings.xml

@@ -273,5 +273,38 @@
                 tools:text="@string/sender_and_message" />
 
         </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/settings_mms_file_size_limit_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingLeft="@dimen/normal_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingRight="@dimen/normal_margin"
+            android:paddingBottom="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_mms_file_size_limit_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@+id/settings_mms_file_size_limit"
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
+                android:text="@string/mms_file_size_limit" />
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_mms_file_size_limit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="@dimen/medium_margin"
+                android:background="@null"
+                android:clickable="false"
+                tools:text="@string/mms_file_size_limit_none" />
+
+        </RelativeLayout>
     </LinearLayout>
 </ScrollView>

app/src/main/res/layout/item_attachment.xml

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_holder"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="@dimen/attachment_preview_size"
+    android:layout_height="@dimen/attachment_preview_size">
 
     <ImageView
         android:id="@+id/thread_attachment_preview"
         android:layout_width="@dimen/attachment_preview_size"
         android:layout_height="@dimen/attachment_preview_size"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <ProgressBar
+        android:id="@+id/thread_attachment_progress"
+        android:layout_width="@dimen/remove_attachment_size"
+        android:layout_height="@dimen/remove_attachment_size"
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/thread_remove_attachment"
@@ -18,6 +28,7 @@
         android:layout_alignEnd="@+id/thread_attachment_preview"
         android:padding="@dimen/tiny_margin"
         android:src="@drawable/ic_cross_vector"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
 
 </RelativeLayout>

app/src/main/res/values-cs/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Proč aplikace vyžaduje přístup k internetu?</string>

app/src/main/res/values-da/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Hvorfor kræver appen adgang til internettet?</string>

app/src/main/res/values-de/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Warum benötigt diese App Internetzugriff?</string>

app/src/main/res/values-el/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Αποστολέας μόνο</string>
     <string name="enable_delivery_reports">Ενεργοποίηση αναφορών παράδοσης</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Γιατί η εφαρμογή απαιτεί πρόσβαση στο Internet;</string>

app/src/main/res/values-es/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">¿Por qué la aplicación requiere acceso a internet?</string>

app/src/main/res/values-fi/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Miksi sovellus vaatii Internet-yhteyden?</string>

app/src/main/res/values-fr/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Pourquoi cette application a besoin d\'un accès à internet ?</string>

app/src/main/res/values-id/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Mengapa aplikasi membutuhkan akses ke internet?</string>

app/src/main/res/values-it/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Solo mittente</string>
     <string name="enable_delivery_reports">Abilita conferma di consegna</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Perché l\'applicazione richiede l\'accesso ad internet?</string>

app/src/main/res/values-ja/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">なぜアプリ使用にインターネットへのアクセスが必要なのですか？</string>

app/src/main/res/values-lt/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Why does the app require access to the internet?</string>

app/src/main/res/values-ml/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">അപ്ലിക്കേഷന് ഇന്റർനെറ്റിലേക്ക് ആവശ്യമായി വരുന്നത് എന്തുകൊണ്ട്?</string>

app/src/main/res/values-nl/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Alleen afzender</string>
     <string name="enable_delivery_reports">Bezorgingsrapporten inschakelen</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Waarom heeft deze app toegang nodig tot het internet?</string>

app/src/main/res/values-pl/strings.xml

@@ -52,6 +52,8 @@
     <string name="sender_only">Tylko nadawca</string>
     <string name="enable_delivery_reports">Włącz raporty doręczeń</string>
     <string name="use_simple_characters">Usuwaj akcenty i znaki diakrytyczne podczas wysyłania wiadomości</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Dlaczego aplikacja wymaga dostępu do Internetu?</string>

app/src/main/res/values-pt/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Porque é que a aplicação necessita de aceder à Internet?</string>

app/src/main/res/values-ru/strings.xml

@@ -52,6 +52,8 @@
     <string name="sender_only">Только отправитель</string>
     <string name="enable_delivery_reports">Использовать отчёты о доставке</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Почему приложение требует доступ к интернету?</string>

app/src/main/res/values-sk/strings.xml

@@ -12,7 +12,7 @@
     <string name="reply">Odpovedať</string>
     <string name="show_character_counter">Zobraziť počítadlo znakov pri písaní správ</string>
     <string name="loading_messages">Načítanie správ…</string>
-    <string name="no_reply_support">Sender doesn\'t support replies</string>
+    <string name="no_reply_support">Odosielateľ nepodporuje odpovede</string>
     <string name="draft">Koncept</string>
     <string name="sending">Odosiela sa…</string>
     <string name="export_messages">Exportovať správy</string>
@@ -52,6 +52,8 @@
     <string name="sender_only">Iba odosielateľ</string>
     <string name="enable_delivery_reports">Povoliť správy o doručení</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Zmenšiť MMS obrázky pri odosielaní</string>
+    <string name="mms_file_size_limit_none">Žiadny limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Prečo vyžaduje apka prístup na internet?</string>

app/src/main/res/values-tr/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Uygulama neden internete erişim gerektiriyor?</string>

app/src/main/res/values-uk/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Чому додаток потрубує доступу до інтернету?</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">为什么该应用需要访问互联网？</string>

app/src/main/res/values/donottranslate.xml

@@ -2,4 +2,11 @@
 
     <string name="package_name">com.simplemobiletools.smsmessenger</string>
 
+    <string name="mms_file_size_limit_100kb">100KB</string>
+    <string name="mms_file_size_limit_200kb">200KB</string>
+    <string name="mms_file_size_limit_300kb">300KB</string>
+    <string name="mms_file_size_limit_600kb">600KB</string>
+    <string name="mms_file_size_limit_1mb">1MB</string>
+    <string name="mms_file_size_limit_2mb">2MB</string>
+
 </resources>

app/src/main/res/values/strings.xml

@@ -50,6 +50,8 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>
+    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Why does the app require access to the internet?</string>

app/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path name="compressed_files" path="compressed/"/>
+</paths>