Merge branch 'fix_iconics' into 'master'

Fix upload iconics

See merge request pixeldroid/PixelDroid!335

app/src/main/java/org/pixeldroid/app/utils/PixelDroidApplication.kt

@@ -26,8 +26,6 @@ class PixelDroidApplication: Application() {
             .aPIModule(APIModule())
             .build()
         mApplicationComponent.inject(this)
-
-        Iconics.init(applicationContext)
     }
 
     fun getAppComponent(): ApplicationComponent {

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM10,17l-3.5,-3.5 1.41,-1.41L10,14.17 15.18,9l1.41,1.41L10,17z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
+</vector>

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

@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible">
 
-        <com.mikepenz.iconics.view.IconicsTextView
+        <TextView
             android:id="@+id/upload_error_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -29,9 +29,11 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:drawableStartCompat="@drawable/cloud_off_24"
+            app:drawableTint="@color/colorPrimaryError" />
 
-        <com.mikepenz.iconics.view.IconicsTextView
+        <TextView
             android:id="@+id/upload_error_text_explanation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -66,7 +68,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/uploadProgressBar"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <com.mikepenz.iconics.view.IconicsTextView
+    <TextView
         android:id="@+id/upload_completed_textview"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
@@ -75,8 +77,11 @@
         android:textColor="@android:color/holo_green_light"
         android:textSize="16sp"
         android:visibility="invisible"
+        app:drawableStartCompat="@drawable/cloud_done_24"
+        app:drawableTint="@android:color/holo_green_light"
+        app:layout_constraintBottom_toTopOf="@id/postTextInputLayout"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/postTextInputLayout"/>
+        tools:visibility="visible" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/buttonConstraints"

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

@@ -163,9 +163,9 @@ For more info about Pixelfed, you can check here: https://pixelfed.org"</string>
     <!-- Sensitive media -->
     <string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Hidden Media\n (click to show)</string>
     <!-- Shown when image has finished uploading. {gmd_cloud_done} is an icon, position it as is appropriate in target language -->
-    <string name="media_upload_completed">{gmd_cloud_done} Media upload completed</string>
+    <string name="media_upload_completed">Media upload completed</string>
     <!-- Shown when image uploading has failed. {gmd_cloud_off} is an icon, position it as is appropriate in target language -->
-    <string name="media_upload_failed">{gmd_cloud_off} Media upload failed, try again or check network conditions</string>
+    <string name="media_upload_failed">Media upload failed, try again or check network conditions</string>
     <string name="posting_image_accessibility_hint">Image that is being posted</string>
     <string name="retry">Retry</string>
     <string name="nothing_to_see_here">Nothing to see here!</string>