Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 19:59:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '828-update-briar-logo-in-app' into 'master'

Browse Source 
Update all logos

The launcher icons are now in mipmap folders which is the recommended practice, because on a low-res device, the high res drawables are stripped from the app. This is bad when the user decides to show the app icons really big on the launcher and the high-res drawables are not available anymore.

The old launcher icon seemed to have some sort of 3D effect.
![device-2016-12-13-134037](/uploads/84db532df3821ad74ba57719f0763b7b/device-2016-12-13-134037.png)

Navigation Drawer Old:
![device-2016-12-13-124112](/uploads/465b817d2e0bbbd50b461ea32686c933/device-2016-12-13-124112.png)
Navigation Drawer New:
![device-2016-12-13-132428](/uploads/3c3530bfc515525dd8f66abfa52d1142/device-2016-12-13-132428.png)

Closes #828

See merge request !459
This commit is contained in:
akwizgran
2016-12-15 23:25:40 +00:00
parent 008e4f760a a6d053a0ea
commit 3ce0131b8c
21 changed files with 757 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/AndroidManifest.xml
View File

@@ -28,7 +28,7 @@
android:allowBackup="false"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:logo="@drawable/logo"
android:logo="@mipmap/ic_launcher_round"
android:theme="@style/BriarTheme">
<service

BIN
briar-android/src/main/ic_launcher_round-web.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
briar-android/src/main/res/drawable-hdpi/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
briar-android/src/main/res/drawable-ldpi/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
briar-android/src/main/res/drawable-mdpi/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
briar-android/src/main/res/drawable-xhdpi/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
briar-android/src/main/res/drawable/briar_logo_large.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
briar-android/src/main/res/drawable/navigation_drawer_header.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

129
briar-android/src/main/res/drawable/navigation_drawer_header.xml Normal file
View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="138dp"
android:height="50dp"
android:viewportHeight="50"
android:viewportWidth="138">
<path
android:fillColor="#87c214"
android:pathData="M230.022,214.001 L239.302,214.001 L239.302,223.281 L230.022,223.281
L230.022,214.001 Z"/>
<path
android:fillColor="#ffffff"
android:pathData="M235.543,203.979 C237.603,203.979,239.301,205.678,239.301,207.737
L239.301,250.141 C239.301,252.201,237.602,253.899,235.543,253.899
L233.781,253.899 C231.721,253.899,230.023,252.2,230.023,250.141 L230.023,207.737
C230.023,205.677,231.7,203.979,233.76,203.979 L235.544,203.979 M235.544,202.493
L233.782,202.493 C230.873,202.493,228.537,204.85,228.537,207.738
L228.537,250.142 C228.537,253.03,230.894,255.387,233.782,255.387
L235.544,255.387 C238.432,255.387,240.789,253.03,240.789,250.142
L240.789,207.738 C240.768,204.85,238.432,202.493,235.544,202.493
L235.544,202.493 Z"/>
<path
android:fillColor="#87c214"
android:pathData="M250.619,234.598 L259.899,234.598 L259.899,243.878 L250.619,243.878
L250.619,234.598 Z"/>
<path
android:fillColor="#ffffff"
android:pathData="M256.14,203.979 C258.2,203.979,259.898,205.678,259.898,207.737 L259.898,250.141
C259.898,252.201,258.221,253.899,256.14,253.899 L254.378,253.899
C252.318,253.899,250.62,252.2,250.62,250.141 L250.62,207.737
C250.62,205.677,252.319,203.979,254.378,203.979 L256.14,203.979 M256.14,202.493
L254.378,202.493 C251.49,202.493,249.133,204.85,249.133,207.738 L249.133,250.142
C249.133,253.03,251.49,255.387,254.378,255.387 L256.14,255.387
C259.028,255.387,261.385,253.03,261.385,250.142 L261.385,207.738
C261.364,204.85,259.028,202.493,256.14,202.493 L256.14,202.493 Z"/>
<path
android:fillColor="#95d220"
android:pathData="M230.022,234.598 L239.302,234.598 L239.302,243.878 L230.022,243.878
L230.022,234.598 Z"/>
<path
android:fillColor="#ffffff"
android:pathData="M266.142,234.598 C268.202,234.598,269.9,236.275,269.9,238.356 L269.9,240.118
C269.9,242.178,268.201,243.876,266.142,243.876 L223.759,243.876
C221.699,243.876,220.001,242.177,220.001,240.118 L220.001,238.356
C220.001,236.296,221.678,234.598,223.759,234.598 L266.142,234.598
M266.142,233.112 L223.759,233.112
C220.871,233.112,218.514,235.448,218.514,238.336 L218.514,240.098
C218.514,242.986,220.871,245.343,223.759,245.343 L266.163,245.343
C269.051,245.343,271.408,242.986,271.408,240.098 L271.408,238.336
C271.387,235.448,269.03,233.112,266.142,233.112 L266.142,233.112 Z"/>
<path
android:fillColor="#95d220"
android:pathData="M250.619,214.001 L259.899,214.001 L259.899,223.281 L250.619,223.281
L250.619,214.001 Z"/>
<path
android:fillColor="#ffffff"
android:pathData="M266.142,214.001 C268.202,214.001,269.9,215.678,269.9,217.759 L269.9,219.521
C269.9,221.581,268.201,223.279,266.142,223.279 L223.759,223.279
C221.677,223.259,220,221.582,220,219.522 L220,217.76
C220,215.7,221.677,214.002,223.758,214.002 L266.141,214.002 M266.141,212.516
L223.758,212.516 C220.87,212.516,218.513,214.852,218.513,217.74 L218.513,219.502
C218.513,222.39,220.87,224.747,223.758,224.747 L266.162,224.747
C269.05,224.747,271.407,222.39,271.407,219.502 L271.407,217.74
C271.386,214.852,269.029,212.516,266.141,212.516 L266.141,212.516 Z"/>
<path
android:fillColor="#ffffff"
android:pathData="M57.0977,30.6992 L57.0977,50 L66.1661,50
C70.3917,50,72.641,47.8764,72.6622,44.5215
C72.6622,42.3769,71.6445,40.7415,69.6485,39.8496 L69.6485,39.8086
C71.1561,38.8743,71.8145,37.7053,71.8145,35.9004
C71.8145,33.1612,69.9664,30.6992,65.9532,30.6992 L57.0977,30.6992 Z
M75.8477,30.6992 L75.8477,50 L78.1192,50 L78.1192,42.2715 L77.8868,42.0371
L82.4727,42.0371 C85.0208,42.0371,86.4857,42.951,87.42,44.9258 L89.8203,50
L92.3672,50 L89.4375,43.9688 C88.8005,42.6098,87.8232,41.7611,86.9102,41.3789
L86.9102,41.3359 C89.0336,40.7838,90.7754,38.9155,90.7754,36.3886
C90.7754,32.5877,87.8237,30.6991,84.2988,30.6991 L75.8476,30.6991 Z
M94.7247,30.6992 L94.7247,50 L96.9981,50 L96.9981,30.6992 L94.7247,30.6992 Z
M108.145,30.6992 L99.6504,50 L102.135,50 L104.174,45.3496 L104.047,45.1152
L114.621,45.1152 L114.494,45.3496 L116.533,50 L119.017,50 L110.544,30.6992
L108.144,30.6992 Z M121.481,30.6992 L121.481,50 L123.752,50 L123.752,42.2715
L123.518,42.0371 L128.106,42.0371
C130.654,42.0371,132.119,42.951,133.053,44.9258 L135.451,50 L138,50
L135.07,43.9688 C134.433,42.6098,133.456,41.7611,132.543,41.3789
L132.543,41.3359 C134.666,40.7838,136.408,38.9155,136.408,36.3886
C136.408,32.5877,133.456,30.6991,129.931,30.6991 L121.48,30.6991 Z
M59.1587,32.8437 L65.7192,32.8437 C68.1823,32.8437,69.479,33.8404,69.479,35.8789
C69.479,37.5989,68.4797,38.9805,65.7192,38.9805 L59.1587,38.9805
L59.3931,38.7461 L59.3931,33.0762 L59.1587,32.8438 Z M77.8872,32.8437
L84.3208,32.8437 C86.699,32.8437,88.4617,33.819,88.4829,36.3671
C88.4829,38.4056,86.8485,39.871,84.0669,39.871 L77.8872,39.871 L78.1196,39.6386
L78.1196,33.0761 L77.8872,32.8437 Z M123.54,32.8437 L129.974,32.8437
C132.331,32.8437,134.115,33.819,134.115,36.3671
C134.115,38.4056,132.502,39.871,129.72,39.871 L123.54,39.871 L123.774,39.6386
L123.774,33.0761 L123.54,32.8437 Z M109.335,33.0546 L109.378,33.0546
L109.95,34.9882 L113.348,42.7382 L113.58,42.9706 L105.109,42.9706
L105.341,42.7382 L108.739,34.9882 L109.333,33.0546 Z M59.1377,41.1249
L66.1455,41.1249 C68.9909,41.1249,70.3076,42.4402,70.3076,44.4999
C70.3076,46.6445,69.1185,47.8339,66.167,47.8339 L59.1377,47.8339
L59.3721,47.5995 L59.3721,41.3573 L59.1377,41.1249 Z"/>
<path
android:fillColor="#87c214"
android:pathData="M13.8086,0.00000870181 C11.7448,0.00000870181,10.0425,1.70197,10.0425,3.7658
L10.0425,8.55303 L19.3194,8.55303 L19.3194,3.7658
C19.3194,1.70197,17.6382,0.00001,15.5744,0.00001 L13.8087,0.00001 Z
M34.4469,0.00000870181 C32.3831,0.00000870181,30.6807,1.70197,30.6807,3.7658
L30.6807,29.1913 L39.9576,29.1913 L39.9576,3.7658
C39.9576,1.70197,38.2764,0.00001,36.2126,0.00001 L34.4469,0.00001 Z
M10.0425,20.8087 L10.0425,46.2341
C10.0425,48.2979,11.7236,49.9999,13.8087,49.9999 L15.5744,49.9999
C17.6382,49.9999,19.3406,48.2979,19.3406,46.2341 L19.3406,20.8086
L10.0425,20.8086 Z M30.6808,41.4469 L30.6808,46.2341
C30.6808,48.2979,32.3832,49.9999,34.447,49.9999 L36.2127,49.9999
C38.2765,49.9999,39.9789,48.2979,39.9789,46.2341 L39.9789,41.4469
L30.6808,41.4469 Z"/>
<path
android:fillColor="#95d220"
android:pathData="M3.76588,10.0424 C1.70205,10.0424,0.00014,11.7235,0.00014,13.8086
L0.00014,15.5743 C0.00014,17.6381,1.68077,19.3405,3.76588,19.3405
L29.1914,19.3405 L29.1914,10.0424 L3.7659,10.0424 Z M41.4471,10.0424
L41.4471,19.3405 L46.2343,19.3405
C48.2981,19.3405,50.0001,17.6594,50.0001,15.5743 L50.0001,13.8086
C50.0001,11.7235,48.2981,10.0424,46.2343,10.0424 L41.4471,10.0424 Z
M3.76579,30.6807 C1.70205,30.6807,-0.00008,32.3618,-0.00008,34.4469
L-0.00008,36.2126 C-0.00008,38.2764,1.68056,39.9788,3.76567,39.9788
L8.5529,39.9788 L8.5529,30.6807 L3.76567,30.6807 Z M20.8087,30.6807
L20.8087,39.9788 L46.2342,39.9788 C48.298,39.9788,50,38.2764,50,36.2126
L50,34.4469 C50,32.3618,48.298,30.6807,46.2342,30.6807 L20.8087,30.6807 Z"/>
</vector>

71
briar-android/src/main/res/drawable/splash_screen.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="235dp"
android:height="310dp"
android:viewportHeight="310"
android:viewportWidth="235">
<path
android:fillColor="#87c214"
android:pathData="M47.2,47.2 L90.9,47.2 L90.9,90.9 L47.2,90.9 L47.2,47.2 Z"/>
<path
android:fillColor="#87c214"
android:pathData="M64.9004,0 C55.2004,0,47.1992,7.99922,47.1992,17.6992 L47.1992,40.1992
L90.8008,40.1992 L90.8008,17.6992
C90.8008,7.99922,82.8992,-4.73695e-15,73.1992,0 L64.9004,0 Z M161.9,0
C152.2,0,144.199,7.99922,144.199,17.6992 L144.199,137.199 L187.801,137.199
L187.801,17.6992 C187.801,7.99922,179.899,-4.73695e-15,170.199,0 L161.9,0 Z
M47.1992,97.8008 L47.1992,217.301 C47.1992,227.001,55.1004,235,64.9004,235
L73.1992,235 C82.8992,235,90.9004,227.001,90.9004,217.301 L90.9004,97.8008
L47.1992,97.8008 Z M144.199,194.801 L144.199,217.301
C144.199,227.001,152.2,235,161.9,235 L170.199,235
C179.899,235,187.9,227.001,187.9,217.301 L187.9,194.801 L144.199,194.801 Z"/>
<path
android:fillColor="#87c214"
android:pathData="M144.2,144.2 L187.9,144.2 L187.9,187.9 L144.2,187.9 L144.2,144.2 Z"/>
<path
android:fillColor="#95d220"
android:pathData="M17.6992,47.1992 C7.99922,47.1992,2.36848e-15,55.1004,0,64.9004 L0,73.1992
C0,82.8992,7.89922,90.9004,17.6992,90.9004 L137.199,90.9004 L137.199,47.1992
L17.6992,47.1992 Z M194.801,47.1992 L194.801,90.9004 L217.301,90.9004
C227.001,90.9004,235,82.9992,235,73.1992 L235,64.9004
C235,55.1004,227.001,47.1992,217.301,47.1992 L194.801,47.1992 Z M17.6992,144.199
C7.99922,144.199,2.36848e-15,152.1,0,161.9 L0,170.199
C0,179.899,7.89922,187.9,17.6992,187.9 L40.1992,187.9 L40.1992,144.199
L17.6992,144.199 Z M97.8008,144.199 L97.8008,187.9 L217.301,187.9
C227.001,187.9,235,179.899,235,170.199 L235,161.9
C235,152.1,227.001,144.199,217.301,144.199 L97.8008,144.199 Z"/>
<path
android:fillColor="#000000"
android:pathData="M0,253.9 L0,310 L26.2656,310 C38.6498,310,45.1426,303.8,45.1426,294.1
C45.1426,287.8,42.2457,283.1,36.4531,280.5 L36.4531,280.4
C40.8475,277.7,42.7461,274.3,42.7461,269 C42.7461,261,37.2532,253.9,25.668,253.9
L0,253.9 Z M54.5313,253.9 L54.5313,310 L61.1211,310 L61.1211,287.5
L60.4238,286.801 L73.7051,286.801
C81.0956,286.801,85.2917,289.399,87.9883,295.199 L94.9785,310 L102.369,310
L94.0801,292.5 C92.2824,288.6,89.3857,286.1,86.7891,285 L86.7891,284.9
C92.8813,283.3,97.9746,277.8,97.9746,270.5
C97.9746,259.4,89.3865,253.9,79.0996,253.9 L54.5313,253.9 Z M109.26,253.9
L109.26,310 L115.852,310 L115.852,253.9 L109.26,253.9 Z M148.012,253.9
L123.342,310 L130.533,310 L136.525,296.5 L136.227,295.801 L166.887,295.801
L166.588,296.5 L172.58,310 L179.771,310 L155.002,253.9 L148.012,253.9 Z
M187.16,253.9 L187.16,310 L193.752,310 L193.752,287.5 L193.053,286.801
L206.336,286.801 C213.727,286.801,217.923,289.399,220.619,295.199 L227.609,310
L235,310 L226.711,292.5 C224.913,288.6,222.017,286.1,219.42,285 L219.42,284.9
C225.512,283.3,230.605,277.8,230.605,270.5
C230.605,259.4,222.017,253.9,211.73,253.9 L187.16,253.9 Z M5.89258,260.1
L24.9688,260.1 C32.1596,260.1,35.9531,263,35.9531,269
C35.9531,274,32.9585,278,24.9688,278 L5.89258,278 L6.5918,277.301
L6.5918,260.801 L5.89258,260.1 Z M60.4238,260.1 L79.0996,260.1
C85.8909,260.1,91.0837,262.9,91.1836,270.4
C91.1836,276.4,86.4901,280.6,78.4004,280.6 L60.4238,280.6 L61.1211,279.9
L61.1211,260.801 L60.4238,260.1 Z M192.953,260.1 L211.629,260.1
C218.52,260.1,223.715,262.9,223.715,270.4
C223.715,276.4,219.021,280.6,210.932,280.6 L192.953,280.6 L193.652,279.9
L193.652,260.801 L192.953,260.1 Z M151.605,260.801 L151.707,260.801
L153.404,266.4 L163.291,288.9 L163.99,289.6 L139.322,289.6 L140.021,288.9
L149.908,266.4 L151.605,260.801 Z M5.89258,284.199 L26.2656,284.199
C34.555,284.199,38.3516,288,38.3516,294.1
C38.3516,300.3,34.8547,303.801,26.2656,303.801 L5.89258,303.801 L6.5918,303.1
L6.5918,284.9 L5.89258,284.199 Z"/>
</vector>

19
briar-android/src/main/res/layout/navigation_header.xml
View File

@@ -1,10 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="85dp"
android:contentDescription="@string/app_name"
android:scaleType="fitStart"
android:src="@drawable/navigation_drawer_header"
tools:showIn="@layout/navigation_menu"/>
android:background="@color/briar_primary"
tools:showIn="@layout/navigation_menu">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/margin_medium"
android:layout_marginLeft="@dimen/margin_medium"
android:contentDescription="@string/app_name"
android:src="@drawable/navigation_drawer_header"/>
</FrameLayout>

10
briar-android/src/main/res/layout/splash.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFFFFF" >
android:background="@color/window_background" >
<ImageView
android:src="@drawable/briar_logo_large"
android:src="@drawable/splash_screen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_margin="@dimen/margin_xxlarge"
android:contentDescription="@string/app_name"/>
</RelativeLayout>
</FrameLayout>

BIN
briar-android/src/main/res/mipmap-hdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
briar-android/src/main/res/mipmap-mdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
briar-android/src/main/res/mipmap-xhdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
briar-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
briar-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB