Merge branch 'develop-2.x' into new/offline-sending

app/src/main/AndroidManifest.xml

@@ -20,7 +20,9 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:networkSecurityConfig="@xml/network_security_config">
         android:supportsRtl="true">
+
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
@@ -114,4 +116,4 @@
             android:theme="@style/AppTheme" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

app/src/main/java/chat/rocket/android/chatroom/ui/PinnedMessagesFragment.kt

@@ -101,9 +101,22 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
                         }
                     })
                 }
+                togglePinView(pinnedMessages.size)
             }
 
             adapter.appendData(pinnedMessages)
         }
     }
+
+    private fun togglePinView(size: Int) {
+        if (size == 0){
+            iv_pin_icon.setVisible(true)
+            tv_pin_title.setVisible(true)
+            tv_pin_description.setVisible(true)
+        }else{
+            iv_pin_icon.setVisible(false)
+            tv_pin_title.setVisible(false)
+            tv_pin_description.setVisible(false)
+        }
+    }
 }
\ No newline at end of file

app/src/main/res/drawable/ic_pin_black_24dp.xml

-<vector android:height="24dp" android:viewportHeight="800.0"
-    android:viewportWidth="800.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/actionMenuColor" android:pathData="M511.8,390H520V84C567,67.8 596.3,42 596.3,16H203.7c0,26 29.3,51.8 76.3,68V390h8.2c-92.9,16 -157.5,61 -157.5,108H377v288h48V498h244.3C669.3,451 604.7,406 511.8,390z"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="197.218"
+    android:viewportHeight="197.218"
+    android:width="197.218dp"
+    android:height="197.218dp">
+    <group
+        android:translateX="-570.396"
+        android:translateY="-306.782">
+        <path
+            android:pathData="M704.445 306.782l-6.785 6.785c-6.084 6.084 -7.622 14.712 -4.309 21.871l-44.068 35.44 -3.086 -3.086c-7.889 -7.889 -19.525 -7.889 -27.414 0l-8.944 8.953 87.821 87.811 8.934 -8.933c7.899 -7.899 7.899 -19.525 0 -27.433l-3.076 -3.077 36.051 -44.68c6.824 2.466 14.367 1.036 20.037 -4.624l8.008 -5.858 -63.169 -63.169zm-66.867 116.487l-67.182 66.857 0 13.874 13.864 0 66.867 -67.182 -13.549 -13.549z"
+            android:fillColor="@color/actionMenuColor"
+            />
+    </group>
+</vector>
\ No newline at end of file

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

@@ -32,4 +32,50 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
+    <ImageView
+        android:id="@+id/iv_pin_icon"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:src="@drawable/ic_pin_black_24dp"
+        android:tint="#AFADAF"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/tv_pin_title"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/tv_pin_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/no_pinned_messages"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/iv_pin_icon"
+        app:layout_constraintBottom_toTopOf="@id/tv_pin_description"
+        android:textSize="20sp"
+        android:layout_marginTop="24dp"
+        android:textStyle="bold"
+        android:textColor="#8B8B8B"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <TextView
+        android:id="@+id/tv_pin_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/no_pinned_description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_pin_title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="16dp"
+        android:textAlignment="center"
+        android:textSize="16sp"
+        android:textColor="#c1c1c1"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

app/src/main/res/values-hi-rIN/strings.xml

@@ -123,6 +123,8 @@
 
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">पिन किए गए संदेश</string>
+    <string name="no_pinned_messages">कोई पिन संदेश नहीं</string>
+    <string name="no_pinned_description">सभी पिन किए गए संदेश यहां\nदिखाई देते हैं।</string>
 
     <!-- Upload Messages -->
     <string name="max_file_size_exceeded">फ़ाइल का आकार %1$d बाइट्स ने %2$d बाइट्स के अधिकतम अपलोड आकार को पार कर लिया है</string>

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

@@ -123,6 +123,8 @@
 
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">Mensagens Pinadas</string>
+    <string name="no_pinned_messages">Nenhuma mensagem pinada</string>
+    <string name="no_pinned_description">Todas as mensagens pinadas\naparecerão aqui</string>
 
     <!-- Upload Messages -->
     <string name="max_file_size_exceeded">Tamanho de arquivo (%1$d bytes) excedeu tamanho máximo de upload (%2$d bytes)</string>

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

@@ -124,6 +124,8 @@
 
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">Pinned Messages</string>
+    <string name="no_pinned_messages">No pinned messages</string>
+    <string name="no_pinned_description">All the pinned messages\nappear here.</string>
 
     <!-- Upload Messages -->
     <string name="max_file_size_exceeded">File size %1$d bytes exceeded max upload size of %2$d bytes</string>

app/src/main/res/xml/network_security_config.xml

+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>