Browse Source

use adaptive launcher icon and notification icon for quicksy

Daniel Gultsch 1 year ago
parent
commit
fc09c5fa86
100 changed files with 450 additions and 136 deletions
  1. 240 131
      art/quicksy.svg
  2. 0 1
      art/quicksy_launcher.svg
  3. 181 0
      art/quicksy_mono.svg
  4. 2 2
      art/render.rb
  5. BIN
      src/conversations/new_launcher-web.png
  6. 0 0
      src/conversations/res/drawable-hdpi/ic_notification.png
  7. 0 0
      src/conversations/res/drawable-mdpi/ic_notification.png
  8. 0 0
      src/conversations/res/drawable-xhdpi/ic_notification.png
  9. 0 0
      src/conversations/res/drawable-xxhdpi/ic_notification.png
  10. 0 0
      src/conversations/res/drawable-xxxhdpi/ic_notification.png
  11. 24 0
      src/conversations/res/drawable/ic_launcher_foreground.xml
  12. 0 0
      src/conversations/res/mipmap-anydpi-v26/new_launcher.xml
  13. 0 0
      src/conversations/res/mipmap-anydpi-v26/new_launcher_round.xml
  14. BIN
      src/conversations/res/mipmap-hdpi/new_launcher.png
  15. BIN
      src/conversations/res/mipmap-hdpi/new_launcher_round.png
  16. BIN
      src/conversations/res/mipmap-mdpi/new_launcher.png
  17. BIN
      src/conversations/res/mipmap-mdpi/new_launcher_round.png
  18. BIN
      src/conversations/res/mipmap-xhdpi/new_launcher.png
  19. BIN
      src/conversations/res/mipmap-xhdpi/new_launcher_round.png
  20. BIN
      src/conversations/res/mipmap-xxhdpi/new_launcher.png
  21. BIN
      src/conversations/res/mipmap-xxhdpi/new_launcher_round.png
  22. BIN
      src/conversations/res/mipmap-xxxhdpi/new_launcher.png
  23. BIN
      src/conversations/res/mipmap-xxxhdpi/new_launcher_round.png
  24. BIN
      src/main/new_launcher-web.png
  25. BIN
      src/main/res/drawable-hdpi/date_bubble_grey.9.png
  26. BIN
      src/main/res/drawable-hdpi/date_bubble_white.9.png
  27. BIN
      src/main/res/drawable-hdpi/message_bubble_received.9.png
  28. BIN
      src/main/res/drawable-hdpi/message_bubble_received_dark.9.png
  29. BIN
      src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
  30. BIN
      src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
  31. BIN
      src/main/res/drawable-hdpi/message_bubble_received_white.9.png
  32. BIN
      src/main/res/drawable-hdpi/message_bubble_sent.9.png
  33. BIN
      src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
  34. BIN
      src/main/res/drawable-mdpi/date_bubble_grey.9.png
  35. BIN
      src/main/res/drawable-mdpi/date_bubble_white.9.png
  36. BIN
      src/main/res/drawable-mdpi/message_bubble_received.9.png
  37. BIN
      src/main/res/drawable-mdpi/message_bubble_received_dark.9.png
  38. BIN
      src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
  39. BIN
      src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
  40. BIN
      src/main/res/drawable-mdpi/message_bubble_received_white.9.png
  41. BIN
      src/main/res/drawable-mdpi/message_bubble_sent.9.png
  42. BIN
      src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
  43. BIN
      src/main/res/drawable-xhdpi/date_bubble_grey.9.png
  44. BIN
      src/main/res/drawable-xhdpi/date_bubble_white.9.png
  45. BIN
      src/main/res/drawable-xhdpi/message_bubble_received.9.png
  46. BIN
      src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png
  47. BIN
      src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
  48. BIN
      src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
  49. BIN
      src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
  50. BIN
      src/main/res/drawable-xhdpi/message_bubble_sent.9.png
  51. BIN
      src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
  52. BIN
      src/main/res/drawable-xxhdpi/date_bubble_grey.9.png
  53. BIN
      src/main/res/drawable-xxhdpi/date_bubble_white.9.png
  54. BIN
      src/main/res/drawable-xxhdpi/message_bubble_received.9.png
  55. BIN
      src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png
  56. BIN
      src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
  57. BIN
      src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
  58. BIN
      src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
  59. BIN
      src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
  60. BIN
      src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
  61. BIN
      src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png
  62. BIN
      src/main/res/drawable-xxxhdpi/date_bubble_white.9.png
  63. BIN
      src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
  64. BIN
      src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png
  65. BIN
      src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
  66. BIN
      src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
  67. BIN
      src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
  68. BIN
      src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
  69. BIN
      src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
  70. BIN
      src/main/res/mipmap-hdpi/ic_launcher_background.png
  71. BIN
      src/main/res/mipmap-mdpi/ic_launcher_background.png
  72. BIN
      src/main/res/mipmap-mdpi/new_launcher.png
  73. BIN
      src/main/res/mipmap-mdpi/new_launcher_round.png
  74. BIN
      src/main/res/mipmap-xhdpi/ic_launcher_background.png
  75. BIN
      src/main/res/mipmap-xhdpi/new_launcher.png
  76. BIN
      src/main/res/mipmap-xhdpi/new_launcher_round.png
  77. BIN
      src/main/res/mipmap-xxhdpi/ic_launcher_background.png
  78. BIN
      src/main/res/mipmap-xxhdpi/new_launcher.png
  79. BIN
      src/main/res/mipmap-xxhdpi/new_launcher_round.png
  80. BIN
      src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
  81. BIN
      src/main/res/mipmap-xxxhdpi/new_launcher.png
  82. BIN
      src/main/res/mipmap-xxxhdpi/new_launcher_round.png
  83. 1 1
      src/quicksy/AndroidManifest.xml
  84. 2 1
      src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java
  85. BIN
      src/quicksy/new_launcher-web.png
  86. BIN
      src/quicksy/res/drawable-hdpi/ic_notification.png
  87. BIN
      src/quicksy/res/drawable-hdpi/launcher.png
  88. BIN
      src/quicksy/res/drawable-hdpi/main_logo.png
  89. BIN
      src/quicksy/res/drawable-hdpi/splash_logo.png
  90. BIN
      src/quicksy/res/drawable-mdpi/ic_notification.png
  91. BIN
      src/quicksy/res/drawable-mdpi/launcher.png
  92. BIN
      src/quicksy/res/drawable-mdpi/main_logo.png
  93. BIN
      src/quicksy/res/drawable-mdpi/splash_logo.png
  94. BIN
      src/quicksy/res/drawable-xhdpi/ic_notification.png
  95. BIN
      src/quicksy/res/drawable-xhdpi/launcher.png
  96. BIN
      src/quicksy/res/drawable-xhdpi/main_logo.png
  97. BIN
      src/quicksy/res/drawable-xhdpi/splash_logo.png
  98. BIN
      src/quicksy/res/drawable-xxhdpi/ic_notification.png
  99. BIN
      src/quicksy/res/drawable-xxhdpi/launcher.png
  100. 0 0
      src/quicksy/res/drawable-xxhdpi/main_logo.png

File diff suppressed because it is too large
+ 240 - 131
art/quicksy.svg


+ 0 - 1
art/quicksy_launcher.svg

@@ -1 +0,0 @@
-quicksy.svg

File diff suppressed because it is too large
+ 181 - 0
art/quicksy_mono.svg


+ 2 - 2
art/render.rb

@@ -11,7 +11,6 @@ resolutions = {
 	}
 
 images = {
-	'quicksy_launcher.svg' => ['quicksy/launcher', 48],
 	'main_logo.svg' => ['conversations/main_logo', 200],
     'quicksy_main_logo.svg' => ['quicksy/main_logo', 200],
     'splash_logo.svg' => ['conversations/splash_logo', 144],
@@ -24,7 +23,8 @@ images = {
 	'play_gif_white.svg' => ['play_gif_white', 128],
     'play_video_black.svg' => ['play_video_black', 128],
     'play_gif_black.svg' => ['play_gif_black', 128],
-	'conversations_mono.svg' => ['ic_notification', 24],
+	'conversations_mono.svg' => ['conversations/ic_notification', 24],
+    'quicksy_mono.svg' => ['quicksy/ic_notification', 24],
 	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
 	'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
 	'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36],

BIN
src/conversations/new_launcher-web.png


src/main/res/drawable-hdpi/ic_notification.png → src/conversations/res/drawable-hdpi/ic_notification.png


src/main/res/drawable-mdpi/ic_notification.png → src/conversations/res/drawable-mdpi/ic_notification.png


src/main/res/drawable-xhdpi/ic_notification.png → src/conversations/res/drawable-xhdpi/ic_notification.png


src/main/res/drawable-xxhdpi/ic_notification.png → src/conversations/res/drawable-xxhdpi/ic_notification.png


src/main/res/drawable-xxxhdpi/ic_notification.png → src/conversations/res/drawable-xxxhdpi/ic_notification.png


File diff suppressed because it is too large
+ 24 - 0
src/conversations/res/drawable/ic_launcher_foreground.xml


src/main/res/mipmap-anydpi-v26/new_launcher.xml → src/conversations/res/mipmap-anydpi-v26/new_launcher.xml


src/main/res/mipmap-anydpi-v26/new_launcher_round.xml → src/conversations/res/mipmap-anydpi-v26/new_launcher_round.xml


BIN
src/conversations/res/mipmap-hdpi/new_launcher.png


BIN
src/conversations/res/mipmap-hdpi/new_launcher_round.png


BIN
src/conversations/res/mipmap-mdpi/new_launcher.png


BIN
src/conversations/res/mipmap-mdpi/new_launcher_round.png


BIN
src/conversations/res/mipmap-xhdpi/new_launcher.png


BIN
src/conversations/res/mipmap-xhdpi/new_launcher_round.png


BIN
src/conversations/res/mipmap-xxhdpi/new_launcher.png


BIN
src/conversations/res/mipmap-xxhdpi/new_launcher_round.png


BIN
src/conversations/res/mipmap-xxxhdpi/new_launcher.png


BIN
src/conversations/res/mipmap-xxxhdpi/new_launcher_round.png


BIN
src/main/new_launcher-web.png


BIN
src/main/res/drawable-hdpi/date_bubble_grey.9.png


BIN
src/main/res/drawable-hdpi/date_bubble_white.9.png


BIN
src/main/res/drawable-hdpi/message_bubble_received.9.png


BIN
src/main/res/drawable-hdpi/message_bubble_received_dark.9.png


BIN
src/main/res/drawable-hdpi/message_bubble_received_grey.9.png


BIN
src/main/res/drawable-hdpi/message_bubble_received_warning.9.png


BIN
src/main/res/drawable-hdpi/message_bubble_received_white.9.png


BIN
src/main/res/drawable-hdpi/message_bubble_sent.9.png


BIN
src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png


BIN
src/main/res/drawable-mdpi/date_bubble_grey.9.png


BIN
src/main/res/drawable-mdpi/date_bubble_white.9.png


BIN
src/main/res/drawable-mdpi/message_bubble_received.9.png


BIN
src/main/res/drawable-mdpi/message_bubble_received_dark.9.png


BIN
src/main/res/drawable-mdpi/message_bubble_received_grey.9.png


BIN
src/main/res/drawable-mdpi/message_bubble_received_warning.9.png


BIN
src/main/res/drawable-mdpi/message_bubble_received_white.9.png


BIN
src/main/res/drawable-mdpi/message_bubble_sent.9.png


BIN
src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png


BIN
src/main/res/drawable-xhdpi/date_bubble_grey.9.png


BIN
src/main/res/drawable-xhdpi/date_bubble_white.9.png


BIN
src/main/res/drawable-xhdpi/message_bubble_received.9.png


BIN
src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png


BIN
src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png


BIN
src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png


BIN
src/main/res/drawable-xhdpi/message_bubble_received_white.9.png


BIN
src/main/res/drawable-xhdpi/message_bubble_sent.9.png


BIN
src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png


BIN
src/main/res/drawable-xxhdpi/date_bubble_grey.9.png


BIN
src/main/res/drawable-xxhdpi/date_bubble_white.9.png


BIN
src/main/res/drawable-xxhdpi/message_bubble_received.9.png


BIN
src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png


BIN
src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png


BIN
src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png


BIN
src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png


BIN
src/main/res/drawable-xxhdpi/message_bubble_sent.9.png


BIN
src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png


BIN
src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png


BIN
src/main/res/drawable-xxxhdpi/date_bubble_white.9.png


BIN
src/main/res/drawable-xxxhdpi/message_bubble_received.9.png


BIN
src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png


BIN
src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png


BIN
src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png


BIN
src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png


BIN
src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png


BIN
src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png


BIN
src/main/res/mipmap-hdpi/ic_launcher_background.png


BIN
src/main/res/mipmap-mdpi/ic_launcher_background.png


BIN
src/main/res/mipmap-mdpi/new_launcher.png


BIN
src/main/res/mipmap-mdpi/new_launcher_round.png


BIN
src/main/res/mipmap-xhdpi/ic_launcher_background.png


BIN
src/main/res/mipmap-xhdpi/new_launcher.png


BIN
src/main/res/mipmap-xhdpi/new_launcher_round.png


BIN
src/main/res/mipmap-xxhdpi/ic_launcher_background.png


BIN
src/main/res/mipmap-xxhdpi/new_launcher.png


BIN
src/main/res/mipmap-xxhdpi/new_launcher_round.png


BIN
src/main/res/mipmap-xxxhdpi/ic_launcher_background.png


BIN
src/main/res/mipmap-xxxhdpi/new_launcher.png


BIN
src/main/res/mipmap-xxxhdpi/new_launcher_round.png


+ 1 - 1
src/quicksy/AndroidManifest.xml

@@ -4,7 +4,7 @@
     package="eu.siacs.conversations">
 
     <application
-        android:icon="@drawable/launcher"
+        android:icon="@mipmap/new_launcher"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:icon">
         <activity

+ 2 - 1
src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java

@@ -24,6 +24,7 @@ import eu.siacs.conversations.services.QuickConversationsService;
 import eu.siacs.conversations.ui.drawable.TextDrawable;
 import eu.siacs.conversations.ui.util.ApiDialogHelper;
 import eu.siacs.conversations.utils.AccountUtils;
+import eu.siacs.conversations.utils.LocationProvider;
 import eu.siacs.conversations.utils.PhoneNumberUtilWrapper;
 import io.michaelrocks.libphonenumber.android.NumberParseException;
 import io.michaelrocks.libphonenumber.android.PhoneNumberUtil;
@@ -94,7 +95,7 @@ public class EnterPhoneNumberActivity extends XmppActivity implements QuickConve
         if (region != null) {
             this.region = region;
         } else {
-            this.region = PhoneNumberUtilWrapper.getUserCountry(this);
+            this.region = LocationProvider.getUserCountry(this);
         }
 
         this.binding = DataBindingUtil.setContentView(this, R.layout.activity_enter_number);

BIN
src/quicksy/new_launcher-web.png


BIN
src/quicksy/res/drawable-hdpi/ic_notification.png


BIN
src/quicksy/res/drawable-hdpi/launcher.png


BIN
src/quicksy/res/drawable-hdpi/main_logo.png


BIN
src/quicksy/res/drawable-hdpi/splash_logo.png


BIN
src/quicksy/res/drawable-mdpi/ic_notification.png


BIN
src/quicksy/res/drawable-mdpi/launcher.png


BIN
src/quicksy/res/drawable-mdpi/main_logo.png


BIN
src/quicksy/res/drawable-mdpi/splash_logo.png


BIN
src/quicksy/res/drawable-xhdpi/ic_notification.png


BIN
src/quicksy/res/drawable-xhdpi/launcher.png


BIN
src/quicksy/res/drawable-xhdpi/main_logo.png


BIN
src/quicksy/res/drawable-xhdpi/splash_logo.png


BIN
src/quicksy/res/drawable-xxhdpi/ic_notification.png


BIN
src/quicksy/res/drawable-xxhdpi/launcher.png


+ 0 - 0
src/quicksy/res/drawable-xxhdpi/main_logo.png


Some files were not shown because too many files changed in this diff