Skip to content

Add adaptive icons! #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samtstern merged 23 commits into from
Aug 4, 2017
Merged

Add adaptive icons! #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
43380f0
Add true support for vector drawables
SUPERCILEX Jul 21, 2017
1c5c33f
Merge remote-tracking branch 'upstream/version-2.2.1-dev' into vectors
SUPERCILEX Aug 2, 2017
57bb934
Add support for Android O
SUPERCILEX Aug 3, 2017
1f59678
Update Gradle
SUPERCILEX Aug 3, 2017
68fb2c7
Update module deps
SUPERCILEX Aug 3, 2017
a3aa129
Merge remote-tracking branch 'upstream/version-2.2.1-dev' into vectors
SUPERCILEX Aug 3, 2017
688c445
Prep for adaptive icons
SUPERCILEX Aug 3, 2017
419d703
Merge branch 'vectors' into adaptive-icons
SUPERCILEX Aug 3, 2017
2970b76
Suppress lint
SUPERCILEX Aug 3, 2017
6b2f649
Add adaptive icons
SUPERCILEX Aug 3, 2017
395aa30
Merge branch 'vectors' into adaptive-icons
SUPERCILEX Aug 3, 2017
0b8f37f
Fix mistakes
SUPERCILEX Aug 3, 2017
2e76edd
Supress lint
SUPERCILEX Aug 3, 2017
06406d2
Merge branch 'vectors' into adaptive-icons
SUPERCILEX Aug 3, 2017
a45cc50
Remove lint suppression
SUPERCILEX Aug 3, 2017
8916b20
Maybe now?
SUPERCILEX Aug 3, 2017
1096000
Merge branch 'vectors' into adaptive-icons
SUPERCILEX Aug 3, 2017
9cf5d3c
Remove suppression
SUPERCILEX Aug 3, 2017
6e065a9
Fix lint?
SUPERCILEX Aug 3, 2017
4d2e3a9
Merge remote-tracking branch 'upstream/version-2.2.1-dev' into adapti…
SUPERCILEX Aug 4, 2017
c88662d
Fix mistakes
SUPERCILEX Aug 4, 2017
b0925a3
Fix merge mistakes
SUPERCILEX Aug 4, 2017
7b325ef
Fix more mistakes
SUPERCILEX Aug 4, 2017
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
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
android:label="@string/app_name"
android:allowBackup="true"
android:fullBackupContent="true"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
Expand Down
19 changes: 0 additions & 19 deletions app/src/main/res/drawable/ic_launcher.xml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@android:color/white"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
5 changes: 5 additions & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@android:color/white"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View file
Open in desktop
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 app/src/main/res/xml-v25/shortcuts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<shortcut
android:shortcutId="storage"
android:enabled="true"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:shortcutShortLabel="@string/name_image">
<intent
android:action="android.intent.action.VIEW"
Expand All @@ -25,7 +25,7 @@
<shortcut
android:shortcutId="database"
android:enabled="true"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:shortcutShortLabel="@string/name_chat">
<intent
android:action="android.intent.action.VIEW"
Expand Down
1 change: 1 addition & 0 deletions library/quality/quality.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ android {
// using Java 8 nio packages. Safely downgrading them to warning.
// https://github.com/square/okio/issues/58
disable 'InvalidPackage',
'IconLauncherFormat', 'IconExpectedSize', // TODO remove with 3.0 Gradle Plugin
'NewerVersionAvailable', 'GradleDependency' // For reproducible builds

baseline file("$configDir/lint-baseline.xml")
Expand Down