New colors and logo (#523)

* Change demo app colors

* Change logo

* Align screenshots

* Update logo in demo app

* Update logo in static folder

* Update app overlay

* Update first screenshot

* Add banner in README

* Add banner in website
debug-base
Mattia Iavarone 5 years ago committed by GitHub
parent be037d6393
commit 3e0ae65dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      README.md
  2. 2
      demo/src/main/AndroidManifest.xml
  3. BIN
      demo/src/main/ic_launcher-web.png
  4. 9
      demo/src/main/res/layout/activity_camera.xml
  5. 5
      demo/src/main/res/mipmap-anydpi-v26/logo.xml
  6. BIN
      demo/src/main/res/mipmap-hdpi/cameraview.png
  7. BIN
      demo/src/main/res/mipmap-hdpi/logo.png
  8. BIN
      demo/src/main/res/mipmap-hdpi/logo_background.png
  9. BIN
      demo/src/main/res/mipmap-hdpi/logo_foreground.png
  10. BIN
      demo/src/main/res/mipmap-mdpi/cameraview.png
  11. BIN
      demo/src/main/res/mipmap-mdpi/logo.png
  12. BIN
      demo/src/main/res/mipmap-mdpi/logo_background.png
  13. BIN
      demo/src/main/res/mipmap-mdpi/logo_foreground.png
  14. BIN
      demo/src/main/res/mipmap-xhdpi/cameraview.png
  15. BIN
      demo/src/main/res/mipmap-xhdpi/logo.png
  16. BIN
      demo/src/main/res/mipmap-xhdpi/logo_background.png
  17. BIN
      demo/src/main/res/mipmap-xhdpi/logo_foreground.png
  18. BIN
      demo/src/main/res/mipmap-xxhdpi/cameraview.png
  19. BIN
      demo/src/main/res/mipmap-xxhdpi/logo.png
  20. BIN
      demo/src/main/res/mipmap-xxhdpi/logo_background.png
  21. BIN
      demo/src/main/res/mipmap-xxhdpi/logo_foreground.png
  22. BIN
      demo/src/main/res/mipmap-xxxhdpi/cameraview.png
  23. BIN
      demo/src/main/res/mipmap-xxxhdpi/logo.png
  24. BIN
      demo/src/main/res/mipmap-xxxhdpi/logo_background.png
  25. BIN
      demo/src/main/res/mipmap-xxxhdpi/logo_foreground.png
  26. 6
      demo/src/main/res/values/colors.xml
  27. 8
      docs/index.md
  28. BIN
      docs/static/banner.png
  29. BIN
      docs/static/icon.png
  30. BIN
      docs/static/screen1.jpg
  31. BIN
      docs/static/screen1.png
  32. BIN
      docs/static/screen2.jpg
  33. BIN
      docs/static/screen2.png
  34. BIN
      docs/static/screen3.jpg
  35. BIN
      docs/static/screen3.png

@ -4,9 +4,10 @@
[![Issues](https://img.shields.io/github/issues-raw/natario1/CameraView.svg)](https://github.com/natario1/CameraView/issues) [![Issues](https://img.shields.io/github/issues-raw/natario1/CameraView.svg)](https://github.com/natario1/CameraView/issues)
[![Funding](https://img.shields.io/opencollective/all/CameraView.svg?colorB=r)](https://natario1.github.io/CameraView/extra/donate) [![Funding](https://img.shields.io/opencollective/all/CameraView.svg?colorB=r)](https://natario1.github.io/CameraView/extra/donate)
&#10240; <!-- Hack to add whitespace -->
<p align="center"> <p align="center">
<img src="docs/static/icon.png" vspace="10" width="250" height="250"> <img src="docs/static/banner.png" width="100%">
</p> </p>
# CameraView # CameraView
@ -36,12 +37,14 @@ Read the [official website](https://natario1.github.io/CameraView) for setup ins
You might also be interested in [changelog](https://natario1.github.io/CameraView/about/changelog.html) You might also be interested in [changelog](https://natario1.github.io/CameraView/about/changelog.html)
or in the [v1 migration guide](https://natario1.github.io/CameraView/extra/v1-migration-guide.html). or in the [v1 migration guide](https://natario1.github.io/CameraView/extra/v1-migration-guide.html).
<p> &#10240; <!-- Hack to add whitespace -->
<img src="docs/static/screen1.jpg" width="250" vspace="20" hspace="5">
<img src="docs/static/screen2.jpg" width="250" vspace="20" hspace="5"> <p align="center">
<img src="docs/static/screen3.jpg" width="250" vspace="20" hspace="5"> <img src="docs/static/screen1.png" width="250" hspace="5"><img src="docs/static/screen2.png" width="250" hspace="5"><img src="docs/static/screen3.png" width="250" hspace="5">
</p> </p>
&#10240; <!-- Hack to add whitespace -->
If you like the project, use it with profit, or simply want to thank back, please consider [donating If you like the project, use it with profit, or simply want to thank back, please consider [donating
to the project](https://natario1.github.io/CameraView/extra/donate) now! You can either make a one time to the project](https://natario1.github.io/CameraView/extra/donate) now! You can either make a one time
donation or become a sponsor, in which case your company logo will immediately show up here. donation or become a sponsor, in which case your company logo will immediately show up here.

@ -7,7 +7,7 @@
<application <application
android:allowBackup="false" android:allowBackup="false"
android:icon="@mipmap/cameraview" android:icon="@mipmap/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

@ -9,7 +9,6 @@
<!-- Camera --> <!-- Camera -->
<com.otaliastudios.cameraview.CameraView <com.otaliastudios.cameraview.CameraView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/camera" android:id="@+id/camera"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -35,14 +34,13 @@
<!-- Watermark --> <!-- Watermark -->
<ImageView <ImageView
android:id="@+id/watermark" android:id="@+id/watermark"
android:layout_width="wrap_content" android:layout_width="72dp"
android:layout_height="wrap_content" android:layout_height="72dp"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
app:layout_drawOnPreview="true" app:layout_drawOnPreview="true"
app:layout_drawOnVideoSnapshot="true" app:layout_drawOnVideoSnapshot="true"
app:layout_drawOnPictureSnapshot="true" app:layout_drawOnPictureSnapshot="true"
android:src="@mipmap/cameraview" android:src="@mipmap/logo_foreground"/>
android:padding="8dp"/>
</com.otaliastudios.cameraview.CameraView> </com.otaliastudios.cameraview.CameraView>
@ -53,6 +51,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:layout_gravity="top|end" android:layout_gravity="top|end"
android:background="@drawable/background" android:background="@drawable/background"
android:elevation="6dp"
app:srcCompat="@drawable/ic_switch" /> app:srcCompat="@drawable/ic_switch" />
<!-- Controls --> <!-- Controls -->

@ -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="@mipmap/logo_background"/>
<foreground android:drawable="@mipmap/logo_foreground"/>
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#009966</color> <color name="colorPrimary">#FFA000</color>
<color name="colorPrimaryDark">#00734d</color> <color name="colorPrimaryDark">#F57C00</color>
<color name="colorAccent">#57db27</color> <color name="colorAccent">#40C4FF</color>
</resources> </resources>

@ -8,6 +8,10 @@ title: "CameraView v2"
CameraView is a well documented, high-level library that makes capturing pictures and videos easy, CameraView is a well documented, high-level library that makes capturing pictures and videos easy,
addressing most of the common issues and needs, and still leaving you with flexibility where needed. addressing most of the common issues and needs, and still leaving you with flexibility where needed.
<p align="center">
<img src="static/banner.png" vspace="10" width="100%">
</p>
- Fast & reliable - Fast & reliable
- Gestures support [[docs]](docs/gestures.html) - Gestures support [[docs]](docs/gestures.html)
- Camera1 or Camera2 powered engine [[docs]](docs/previews.html) - Camera1 or Camera2 powered engine [[docs]](docs/previews.html)
@ -22,10 +26,6 @@ addressing most of the common issues and needs, and still leaving you with flexi
- Works down to API level 15 - Works down to API level 15
- Well tested - Well tested
<p align="center">
<img src="static/icon.png" vspace="10" width="200" height="200">
</p>
### Get started ### Get started
Get started with [install info](about/install.html), [quick setup](about/getting-started.html), or Get started with [install info](about/install.html), [quick setup](about/getting-started.html), or

Binary file not shown.

After

Width:  |  Height:  |  Size: 270 KiB

BIN
docs/static/icon.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 302 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 KiB

Loading…
Cancel
Save