diff --git a/.gitignore b/.gitignore index f3114949a..56bef97d7 100644 --- a/.gitignore +++ b/.gitignore @@ -145,7 +145,6 @@ assets/override bower_components buck-out/ build-ios -build/ build/Release captures/ coverage @@ -189,4 +188,12 @@ xcuserdata xcuserdata/ yarn-debug.log* yarn-error.log -yarn-error.log* \ No newline at end of file +yarn-error.log* + +# 새로 적용된 .gitignore 규칙에 의해 무시되었으나, 기존 프로젝트에서 관리(Tracking)되고 있던 필수 파일들 예외 처리 +!android/app/debug.keystore +!android/app/google-services.json +!build/notice-file/Readme.md +!build/notice-file/config.yaml +!env.d.ts +!fastlane/screenshots/README.txt \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 88a23931f..5855ee098 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index 1b93b5c64..5855ee098 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png 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 index 6dc7f729c..5855ee098 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png 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 index d1f58b4df..5855ee098 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png 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 index 3ee707ebe..80200d637 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png index 562baee4a..80200d637 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png 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 index d1126eace..80200d637 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png 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 index 8f316094b..80200d637 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png 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 index fa1b6a1e2..340b2c4e4 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index 98e61dfb5..340b2c4e4 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png 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 index e238e2ffb..340b2c4e4 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png 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 index 1608e3758..340b2c4e4 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png 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 index d602a8aa3..1bdffe7e8 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index c0900130a..1bdffe7e8 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png 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 index 6926cf810..1bdffe7e8 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png 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 index 9e00117fa..1bdffe7e8 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png 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 index 52f7e0ed4..f1ab997d7 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index 406509cb4..f1ab997d7 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png 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 index 40859eb88..f1ab997d7 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png 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 index f8f8cabfe..f1ab997d7 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/assets/base/images/energy.png b/assets/base/images/energy.png new file mode 100644 index 000000000..9ec878b27 Binary files /dev/null and b/assets/base/images/energy.png differ diff --git a/assets/base/images/energy_padded.png b/assets/base/images/energy_padded.png new file mode 100644 index 000000000..cc8fad934 Binary files /dev/null and b/assets/base/images/energy_padded.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png index 9b90b7220..ae0daf94f 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png index 288f0059a..589a8a42e 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png index 94bb15727..bdd122122 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png index ed3d6aa77..776d26314 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png index 88cfc8890..2acc0c29d 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png index 3e582a093..6354e310d 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png index bea0904e4..589a8a42e 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png index 826a83fd1..1136a1a45 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png index 33ba4bb53..b9916e91f 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png index 56771a648..52451ac3d 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png index adab2ea48..71059bacc 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png index 09ab49c58..e87a7f027 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png index 93b7132f8..b9916e91f 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png index 2cd8db2d7..26edd6cab 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png index f96617468..cecfd14ba 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png differ