diff --git a/android/app/build.gradle b/android/app/build.gradle index 403009437..33c100ff6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -195,6 +195,7 @@ android { flavorDimensions "type" productFlavors { foss { + applicationId "chat.rocket.android" dimension = "type" buildConfigField "boolean", "FDROID_BUILD", "true" } diff --git a/android/app/src/foss/ic_launcher-web.png b/android/app/src/foss/ic_launcher-web.png new file mode 100644 index 000000000..ee9b88757 Binary files /dev/null and b/android/app/src/foss/ic_launcher-web.png differ diff --git a/android/app/src/foss/res/drawable-xxhdpi/splash.png b/android/app/src/foss/res/drawable-xxhdpi/splash.png new file mode 100644 index 000000000..6fd1cbc91 Binary files /dev/null and b/android/app/src/foss/res/drawable-xxhdpi/splash.png differ diff --git a/android/app/src/foss/res/drawable/ic_launcher_background.xml b/android/app/src/foss/res/drawable/ic_launcher_background.xml index 1369c4c71..d5d367da7 100644 --- a/android/app/src/foss/res/drawable/ic_launcher_background.xml +++ b/android/app/src/foss/res/drawable/ic_launcher_background.xml @@ -3,7 +3,10 @@ android:height="108dp" android:viewportWidth="512" android:viewportHeight="512"> - + + + + diff --git a/android/app/src/foss/res/drawable/ic_launcher_foreground.xml b/android/app/src/foss/res/drawable/ic_launcher_foreground.xml index 4fb25367c..f7009c7e0 100644 --- a/android/app/src/foss/res/drawable/ic_launcher_foreground.xml +++ b/android/app/src/foss/res/drawable/ic_launcher_foreground.xml @@ -1,19 +1,24 @@ - - - - - + android:viewportWidth="731.4286" + android:viewportHeight="731.4286"> + + + + + + + + diff --git a/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher.xml index b3ee0dad1..bbd3e0212 100644 --- a/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher_round.xml index b3ee0dad1..bbd3e0212 100644 --- a/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/android/app/src/foss/res/mipmap-hdpi/ic_launcher.png b/android/app/src/foss/res/mipmap-hdpi/ic_launcher.png index f1878e47b..8b836cf4a 100644 Binary files a/android/app/src/foss/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/foss/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/foss/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/foss/res/mipmap-hdpi/ic_launcher_background.png deleted file mode 100644 index 8538bed39..000000000 Binary files a/android/app/src/foss/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ diff --git a/android/app/src/foss/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/foss/res/mipmap-hdpi/ic_launcher_round.png index bd72cd260..864332a8d 100644 Binary files a/android/app/src/foss/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/foss/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/foss/res/mipmap-mdpi/ic_launcher.png b/android/app/src/foss/res/mipmap-mdpi/ic_launcher.png index 1e3da8a39..41e6ee164 100644 Binary files a/android/app/src/foss/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/foss/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/foss/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/foss/res/mipmap-mdpi/ic_launcher_background.png deleted file mode 100644 index a92ccfafb..000000000 Binary files a/android/app/src/foss/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ diff --git a/android/app/src/foss/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/foss/res/mipmap-mdpi/ic_launcher_round.png index dfb390737..53a7f92cb 100644 Binary files a/android/app/src/foss/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/foss/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/foss/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/foss/res/mipmap-xhdpi/ic_launcher.png index ce6abf0d6..3e6741203 100644 Binary files a/android/app/src/foss/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/foss/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/foss/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/foss/res/mipmap-xhdpi/ic_launcher_background.png deleted file mode 100644 index 3ba37c9e9..000000000 Binary files a/android/app/src/foss/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ diff --git a/android/app/src/foss/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/foss/res/mipmap-xhdpi/ic_launcher_round.png index 710fac56a..576a3f64d 100644 Binary files a/android/app/src/foss/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/foss/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher.png index 1ba89143e..d359e0319 100644 Binary files a/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_background.png deleted file mode 100644 index 07f6de5a9..000000000 Binary files a/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_round.png index 86822fdd2..d13c3f15b 100644 Binary files a/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher.png index 2830a1249..c0404b544 100644 Binary files a/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_background.png deleted file mode 100644 index 5ae3008fe..000000000 Binary files a/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_round.png index a17913dc1..60f50d2b6 100644 Binary files a/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/foss/res/values/colors.xml b/android/app/src/foss/res/values/colors.xml index 35e0dfb6d..8f2cb7421 100644 --- a/android/app/src/foss/res/values/colors.xml +++ b/android/app/src/foss/res/values/colors.xml @@ -1,6 +1,6 @@ #660B0B0B - #eeeff1 - #CC3333 - + #F5455C + #F5455C + \ No newline at end of file diff --git a/android/app/src/main/ic_launcher-web.png b/android/app/src/main/ic_launcher-web.png index 469e3e31e..cc5e2e30b 100644 Binary files a/android/app/src/main/ic_launcher-web.png and b/android/app/src/main/ic_launcher-web.png differ diff --git a/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml new file mode 100644 index 000000000..a04cafb8d --- /dev/null +++ b/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable-hdpi/ic_notification.png b/android/app/src/main/res/drawable-hdpi/ic_notification.png new file mode 100644 index 000000000..c1ca2bde0 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_notification.png differ diff --git a/android/app/src/main/res/drawable-hdpi/logo.png b/android/app/src/main/res/drawable-hdpi/logo.png old mode 100755 new mode 100644 index 6d56e9f5d..b4d275593 Binary files a/android/app/src/main/res/drawable-hdpi/logo.png and b/android/app/src/main/res/drawable-hdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_notification.png b/android/app/src/main/res/drawable-mdpi/ic_notification.png new file mode 100644 index 000000000..dbb89065f Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_notification.png differ diff --git a/android/app/src/main/res/drawable-mdpi/logo.png b/android/app/src/main/res/drawable-mdpi/logo.png old mode 100755 new mode 100644 index 375dae9cc..9b3c622a0 Binary files a/android/app/src/main/res/drawable-mdpi/logo.png and b/android/app/src/main/res/drawable-mdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-v24/ic_launcher_background.xml b/android/app/src/main/res/drawable-v24/ic_launcher_background.xml deleted file mode 100644 index 6e2c4fed1..000000000 --- a/android/app/src/main/res/drawable-v24/ic_launcher_background.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/android/app/src/main/res/drawable-xhdpi/ic_notification.png b/android/app/src/main/res/drawable-xhdpi/ic_notification.png new file mode 100644 index 000000000..ee3978a3f Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_notification.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/logo.png b/android/app/src/main/res/drawable-xhdpi/logo.png old mode 100755 new mode 100644 index 3e85a65d2..b1d639a32 Binary files a/android/app/src/main/res/drawable-xhdpi/logo.png and b/android/app/src/main/res/drawable-xhdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png new file mode 100644 index 000000000..f9405b448 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/logo.png b/android/app/src/main/res/drawable-xxhdpi/logo.png old mode 100755 new mode 100644 index a13087a4e..86ef8a102 Binary files a/android/app/src/main/res/drawable-xxhdpi/logo.png and b/android/app/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/logo.png b/android/app/src/main/res/drawable-xxxhdpi/logo.png old mode 100755 new mode 100644 index 8adfb1674..c08988975 Binary files a/android/app/src/main/res/drawable-xxxhdpi/logo.png and b/android/app/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png deleted file mode 100644 index ad69ba207..000000000 Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100755 index 283cd03d7..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 22ba3f90c..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b5e406531..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_notification.png b/android/app/src/main/res/mipmap-hdpi/ic_notification.png deleted file mode 100644 index 08b68046a..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_notification.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png deleted file mode 100644 index 2fc62c96b..000000000 Binary files a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_notification.png b/android/app/src/main/res/mipmap-ldpi/ic_notification.png deleted file mode 100644 index 6dfec747b..000000000 Binary files a/android/app/src/main/res/mipmap-ldpi/ic_notification.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100755 index 7058008e3..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 63495400d..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 3296da8bc..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_notification.png b/android/app/src/main/res/mipmap-mdpi/ic_notification.png deleted file mode 100644 index 6dfec747b..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_notification.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100755 index 27fe2a7e9..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 707e83311..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 6a05faa33..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_notification.png b/android/app/src/main/res/mipmap-xhdpi/ic_notification.png deleted file mode 100644 index 31ebe6059..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_notification.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100755 index 84884b9e3..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index bc656a040..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index d1a0abb0e..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png b/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png deleted file mode 100644 index 556047f2e..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100755 index 4b60c7eb8..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 4eeb42539..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 02cec6d94..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png deleted file mode 100644 index a252c5dfd..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png and /dev/null differ diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml index 1e24e3159..95d576b0a 100644 --- a/android/app/src/main/res/values-night/colors.xml +++ b/android/app/src/main/res/values-night/colors.xml @@ -1,4 +1,5 @@ #000000 + #F5455C \ No newline at end of file diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 8ba17e337..cdcd7c53a 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ #660B0B0B - #eeeff1 - #CC3333 + #1D74F5 + #1D74F5 \ No newline at end of file diff --git a/android/app/src/play/ic_launcher-web.png b/android/app/src/play/ic_launcher-web.png new file mode 100644 index 000000000..cc5e2e30b Binary files /dev/null and b/android/app/src/play/ic_launcher-web.png differ diff --git a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java index e0e6bd8cf..23179fd60 100644 --- a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java +++ b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java @@ -4,39 +4,36 @@ import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; +import android.app.Person; import android.app.RemoteInput; -import android.content.Intent; import android.content.Context; +import android.content.Intent; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.Icon; import android.os.Build; import android.os.Bundle; -import android.app.Person; import androidx.annotation.Nullable; -import com.google.gson.Gson; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; - -import java.util.concurrent.ExecutionException; -import java.lang.InterruptedException; - import com.facebook.react.bridge.ReactApplicationContext; +import com.google.gson.Gson; import com.wix.reactnativenotifications.core.AppLaunchHelper; import com.wix.reactnativenotifications.core.AppLifecycleFacade; import com.wix.reactnativenotifications.core.JsIOHelper; import com.wix.reactnativenotifications.core.notification.PushNotification; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutionException; import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME; @@ -187,7 +184,7 @@ public class CustomPushNotification extends PushNotification { private Bitmap largeIcon() { final Resources res = mContext.getResources(); String packageName = mContext.getPackageName(); - int largeIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName); + int largeIconResId = res.getIdentifier("ic_notification", "drawable", packageName); Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId); return largeIconBitmap; } @@ -196,7 +193,7 @@ public class CustomPushNotification extends PushNotification { final Resources res = mContext.getResources(); String packageName = mContext.getPackageName(); - int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName); + int smallIconResId = res.getIdentifier("ic_notification", "drawable", packageName); Gson gson = new Gson(); Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class); @@ -326,7 +323,7 @@ public class CustomPushNotification extends PushNotification { final Resources res = mContext.getResources(); String packageName = mContext.getPackageName(); - int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName); + int smallIconResId = res.getIdentifier("ic_notification", "drawable", packageName); Intent replyIntent = new Intent(mContext, ReplyBroadcast.class); replyIntent.setAction(KEY_REPLY); diff --git a/android/app/src/play/res/drawable-v24/ic_launcher_background.xml b/android/app/src/play/res/drawable-v24/ic_launcher_background.xml new file mode 100644 index 000000000..9e9d5fe99 --- /dev/null +++ b/android/app/src/play/res/drawable-v24/ic_launcher_background.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/android/app/src/play/res/drawable-xxhdpi/splash.png b/android/app/src/play/res/drawable-xxhdpi/splash.png new file mode 100644 index 000000000..23285f1ba Binary files /dev/null and b/android/app/src/play/res/drawable-xxhdpi/splash.png differ diff --git a/android/app/src/play/res/drawable/ic_launcher_foreground.xml b/android/app/src/play/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..a2b8f09ba --- /dev/null +++ b/android/app/src/play/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/play/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 68% rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to android/app/src/play/res/mipmap-anydpi-v26/ic_launcher.xml index c4a603d4c..bbd3e0212 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/play/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/play/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 68% rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to android/app/src/play/res/mipmap-anydpi-v26/ic_launcher_round.xml index c4a603d4c..bbd3e0212 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/android/app/src/play/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/android/app/src/play/res/mipmap-hdpi/ic_launcher.png b/android/app/src/play/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..d5c886a8a Binary files /dev/null and b/android/app/src/play/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/play/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/play/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..0de94dd9d Binary files /dev/null and b/android/app/src/play/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/play/res/mipmap-mdpi/ic_launcher.png b/android/app/src/play/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..2e9096323 Binary files /dev/null and b/android/app/src/play/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/play/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/play/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..bdae6c61e Binary files /dev/null and b/android/app/src/play/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/play/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/play/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..4ccdd432d Binary files /dev/null and b/android/app/src/play/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/play/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/play/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e0c30d443 Binary files /dev/null and b/android/app/src/play/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/play/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/play/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..eeabae5da Binary files /dev/null and b/android/app/src/play/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/play/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/play/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..2c89a60a9 Binary files /dev/null and b/android/app/src/play/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/play/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/play/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..13fbc0d6b Binary files /dev/null and b/android/app/src/play/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/play/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/play/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..6bcdf733a Binary files /dev/null and b/android/app/src/play/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/ios/LaunchScreen.storyboard b/ios/LaunchScreen.storyboard index 57726b48c..4cf51f288 100644 --- a/ios/LaunchScreen.storyboard +++ b/ios/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -18,7 +18,7 @@ - + @@ -41,9 +41,9 @@ - + - + diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/100.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/100.png new file mode 100644 index 000000000..b05b16588 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/100.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/1024.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 000000000..91b959568 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/114.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 000000000..f834c0e79 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/114.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/120.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 000000000..4394e85f6 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/120.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/144.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/144.png new file mode 100644 index 000000000..8a40ac57c Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/144.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/152.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/152.png new file mode 100644 index 000000000..2ea19ef7c Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/152.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/167.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/167.png new file mode 100644 index 000000000..63fc045d3 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/167.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/180.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 000000000..f1bb0bde5 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/180.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/20.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/20.png new file mode 100644 index 000000000..2831ef3f3 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/20.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/29.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 000000000..afba5aff9 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/40.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 000000000..4f9600060 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/50.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/50.png new file mode 100644 index 000000000..b5be96788 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/50.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/57.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 000000000..9174bb4c0 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/57.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/58.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 000000000..b4522d64b Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/58.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/60.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 000000000..8fc0c2082 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/60.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/72.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/72.png new file mode 100644 index 000000000..387037199 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/72.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/76.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/76.png new file mode 100644 index 000000000..73f2dff7a Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/76.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/80.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 000000000..e22a90389 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/80.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/87.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 000000000..055bf5e62 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/87.png differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/Contents.json index 537008f60..4fdf88263 100644 --- a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,158 +1,158 @@ { "images" : [ { - "size" : "20x20", + "filename" : "40.png", "idiom" : "iphone", - "filename" : "icon-20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "60.png", "idiom" : "iphone", - "filename" : "icon-20@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "29.png", "idiom" : "iphone", - "filename" : "icon-29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "58.png", "idiom" : "iphone", - "filename" : "icon-29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "87.png", "idiom" : "iphone", - "filename" : "icon-29@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "80.png", "idiom" : "iphone", - "filename" : "icon-40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "120.png", "idiom" : "iphone", - "filename" : "icon-40@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { - "size" : "57x57", + "filename" : "57.png", "idiom" : "iphone", - "filename" : "icon-57@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "57x57" }, { - "size" : "57x57", + "filename" : "114.png", "idiom" : "iphone", - "filename" : "icon-57@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "57x57" }, { - "size" : "60x60", + "filename" : "120.png", "idiom" : "iphone", - "filename" : "icon-60@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { - "size" : "60x60", + "filename" : "180.png", "idiom" : "iphone", - "filename" : "icon-60@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", + "filename" : "20.png", "idiom" : "ipad", - "filename" : "icon-20@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "40.png", "idiom" : "ipad", - "filename" : "icon-20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "29.png", "idiom" : "ipad", - "filename" : "icon-29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "58.png", "idiom" : "ipad", - "filename" : "icon-29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "40.png", "idiom" : "ipad", - "filename" : "icon-40@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "80.png", "idiom" : "ipad", - "filename" : "icon-40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "50x50", + "filename" : "50.png", "idiom" : "ipad", - "filename" : "icon-50@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "50x50" }, { - "size" : "50x50", + "filename" : "100.png", "idiom" : "ipad", - "filename" : "icon-50@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "50x50" }, { - "size" : "72x72", + "filename" : "72.png", "idiom" : "ipad", - "filename" : "icon-72@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "72x72" }, { - "size" : "72x72", + "filename" : "144.png", "idiom" : "ipad", - "filename" : "icon-72@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "72x72" }, { - "size" : "76x76", + "filename" : "76.png", "idiom" : "ipad", - "filename" : "icon-76@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", + "filename" : "152.png", "idiom" : "ipad", - "filename" : "icon-76@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" }, { - "size" : "83.5x83.5", + "filename" : "167.png", "idiom" : "ipad", - "filename" : "icon-83.5@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", + "filename" : "1024.png", "idiom" : "ios-marketing", - "filename" : "icon-1024@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-1024@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-1024@1x.png deleted file mode 100644 index 0f012c152..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-1024@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@1x.png deleted file mode 100644 index 1a37ed608..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@2x.png deleted file mode 100644 index 00b10e79b..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@3x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@3x.png deleted file mode 100644 index dc26f5ed8..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-20@3x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@1x.png deleted file mode 100644 index 0dd4dc0b1..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@2x.png deleted file mode 100644 index 426e547e0..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@3x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@3x.png deleted file mode 100644 index 7b3c125a3..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-29@3x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@1x.png deleted file mode 100644 index 00b10e79b..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@2x.png deleted file mode 100644 index 41868cd3b..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@3x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@3x.png deleted file mode 100644 index bf3a4f04e..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-40@3x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-50@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-50@1x.png deleted file mode 100644 index 81c001750..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-50@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-50@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-50@2x.png deleted file mode 100644 index 1797b61b0..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-50@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-57@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-57@1x.png deleted file mode 100644 index 0259ff72d..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-57@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-57@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-57@2x.png deleted file mode 100644 index ef9ea81a9..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-57@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-60@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-60@2x.png deleted file mode 100644 index bf3a4f04e..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-60@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-60@3x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-60@3x.png deleted file mode 100644 index 60d5f2e27..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-60@3x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-72@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-72@1x.png deleted file mode 100644 index 7065d8c44..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-72@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-72@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-72@2x.png deleted file mode 100644 index 9c8e72689..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-72@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-76@1x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-76@1x.png deleted file mode 100644 index a9cc225d3..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-76@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-76@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-76@2x.png deleted file mode 100644 index fec026889..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-76@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png deleted file mode 100644 index 222006515..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/Contents.json b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/Contents.json index 2bea733d9..add923b2a 100644 --- a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/Contents.json +++ b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { + "filename" : "icon.png", "idiom" : "universal", - "filename" : "icon@1x.png", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon.png b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon.png new file mode 100644 index 000000000..b8b1ab226 Binary files /dev/null and b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon.png differ diff --git a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@1x.png b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@1x.png deleted file mode 100644 index 2829674d7..000000000 Binary files a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@1x.png and /dev/null differ diff --git a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@2x.png b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@2x.png index 35cb61dae..dd29b4d50 100644 Binary files a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@2x.png and b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@2x.png differ diff --git a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@3x.png b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@3x.png index 990fe8d4b..42281021c 100644 Binary files a/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@3x.png and b/ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@3x.png differ diff --git a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/Contents.json b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/Contents.json index 3c81c9f86..add923b2a 100644 --- a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/Contents.json +++ b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon.png b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon.png index 845971a05..3ab70276f 100644 Binary files a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon.png and b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon.png differ diff --git a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@2x.png b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@2x.png index 7ae5252ee..7aeca998c 100644 Binary files a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@2x.png and b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@2x.png differ diff --git a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@3x.png b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@3x.png index ad69ba207..23285f1ba 100644 Binary files a/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@3x.png and b/ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@3x.png differ diff --git a/ios/RocketChatRN/Images.xcassets/splashBackgroundColor.colorset/Contents.json b/ios/RocketChatRN/Images.xcassets/splashBackgroundColor.colorset/Contents.json index b3831d3f7..0e90a95d4 100644 --- a/ios/RocketChatRN/Images.xcassets/splashBackgroundColor.colorset/Contents.json +++ b/ios/RocketChatRN/Images.xcassets/splashBackgroundColor.colorset/Contents.json @@ -1,26 +1,18 @@ { - "properties" : { - "localizable" : true - }, - "info" : { - "version" : 1, - "author" : "xcode" - }, "colors" : [ { - "idiom" : "universal", "color" : { "color-space" : "extended-srgb", "components" : { - "red" : "0.933", "alpha" : "1.000", "blue" : "0.945", - "green" : "0.937" + "green" : "0.937", + "red" : "0.933" } - } + }, + "idiom" : "universal" }, { - "idiom" : "universal", "appearances" : [ { "appearance" : "luminosity", @@ -30,15 +22,15 @@ "color" : { "color-space" : "extended-srgb", "components" : { - "red" : "0xEE", "alpha" : "1.000", - "blue" : "0xF1", - "green" : "0xEF" + "blue" : "0xF5", + "green" : "0x74", + "red" : "0x1D" } - } + }, + "idiom" : "universal" }, { - "idiom" : "universal", "appearances" : [ { "appearance" : "luminosity", @@ -48,12 +40,20 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "0x00", "alpha" : "1.000", "blue" : "0x00", - "green" : "0x00" + "green" : "0x00", + "red" : "0x00" } - } + }, + "idiom" : "universal" } - ] -} \ No newline at end of file + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "localizable" : true + } +}