Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET"/>
<application
android:label="Zulip beta"
android:label="Zulip"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp
Binary file not shown.
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp
Binary file not shown.
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
20 changes: 0 additions & 20 deletions assets/app-icons/zulip-beta-combined.svg

This file was deleted.

4 changes: 0 additions & 4 deletions assets/app-icons/zulip-white-z-beta-on-transparent.svg

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Zulip beta</string>
<string>Zulip</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Zulip beta</string>
<string>Zulip</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
8 changes: 3 additions & 5 deletions tools/generate-logos
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,16 @@ jq --version >/dev/null 2>&1 \
|| die "Need jq -- try 'apt install jq'."


# White Z above "BETA", on transparent background.
# TODO(#715): use the non-beta version
src_icon_foreground="${root_dir}"/assets/app-icons/zulip-white-z-beta-on-transparent.svg
# White Z, on transparent background.
src_icon_foreground="${root_dir}"/assets/app-icons/zulip-white-z-on-transparent.svg

# Gradient-colored square, full-bleed.
src_icon_background="${root_dir}"/assets/app-icons/zulip-gradient.svg

# Combination of ${src_icon_foreground} upon ${src_icon_background}...
# more or less. (The foreground layer is larger, with less padding,
# and the SVG is different in random other ways.)
# TODO(#715): use the non-beta version
src_icon_combined="${root_dir}"/assets/app-icons/zulip-beta-combined.svg
src_icon_combined="${root_dir}"/assets/app-icons/zulip-combined.svg
Comment on lines -58 to +57
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also delete the beta SVGs from the repo; I don't think we'll have a further use for them once this is merged.

(And if we do, they'll always be there in the Git history.)



make_one_ios_app_icon() {
Expand Down