PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Fix first time wizard design

Browse source
This commit is contained in:
Dominik Schürmann 2015-02-03 19:13:02 +01:00
parent dfe92ceb24
commit e29ea517da
11 changed files with 78 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
Graphics/drawables/create_key_robot.svg
View file

@ -24,9 +24,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6"
inkscape:cx="19.859075"
inkscape:cy="10.23901"
inkscape:zoom="15.839192"
inkscape:cx="16.585032"
inkscape:cy="15.200896"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@ -52,51 +52,48 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1007.3622)">
<g
id="g3761">
<path
id="path5399"
d="m 22.166071,1009.3123 c -5.613738,0 -10.131173,4.5175 -10.131173,10.1312 l 0,18.6956 c 0,5.6138 4.517435,10.1365 10.131173,10.1365 l 0.6677,0 c 5.613732,0 10.131173,-4.5227 10.131173,-10.1365 l 0,-18.6956 c 0,-5.6137 -4.517441,-10.1312 -10.131173,-10.1312 l -0.6677,0 z m 0.336476,3.3649 c 4.044517,0 7.223786,3.1791 7.223786,7.1291 l 0,14.9628 c 0,3.95 -3.179269,7.1292 -7.223786,7.1292 -4.044516,0 -7.229038,-3.1792 -7.229038,-7.1292 l 0,-14.9628 c 0,-3.95 3.184522,-7.1291 7.229038,-7.1291 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#669900;stroke-width:1.74663651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0" />
<rect
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#669900;stroke-width:1.74663651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect5401"
width="33.961983"
height="24.945528"
x="5.5190063"
y="1025.4666"
rx="0.79848224"
ry="0.79848224" />
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#669900;stroke-width:1.74663651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 11.109664,1043.5389 c 2.495006,2.065 6.666898,3.4226 11.392966,3.4226 4.725665,0 8.89263,-1.3579 11.387713,-3.4226 z"
id="path5403"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscc" />
<path
sodipodi:type="arc"
style="color:#000000;fill:none;stroke:#669900;stroke-width:9.60078144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path5405"
sodipodi:cx="307.48431"
sodipodi:cy="407.66223"
sodipodi:rx="9.388834"
sodipodi:ry="9.388834"
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0"
transform="matrix(0.1819265,0,0,0.1819265,-43.957774,964.33702)"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true" />
<path
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0 9.388834,9.388834 0 1 1 18.77767,0 z"
sodipodi:ry="9.388834"
sodipodi:rx="9.388834"
sodipodi:cy="407.66223"
sodipodi:cx="307.48431"
id="path5407"
style="color:#000000;fill:#669900;fill-opacity:1;fill-rule:nonzero;stroke:#669900;stroke-width:9.60078144000000044;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc"
transform="matrix(0.1819265,0,0,0.1819265,-21.704758,965.01923)" />
</g>
<path
inkscape:connector-curvature="0"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#8bc34a;stroke-width:1.74663651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 22.166071,1009.3123 c -5.613738,0 -10.131173,4.5175 -10.131173,10.1312 l 0,18.6956 c 0,5.6138 4.517435,10.1365 10.131173,10.1365 l 0.6677,0 c 5.613732,0 10.131173,-4.5227 10.131173,-10.1365 l 0,-18.6956 c 0,-5.6137 -4.517441,-10.1312 -10.131173,-10.1312 l -0.6677,0 z m 0.336476,3.3649 c 4.044517,0 7.223786,3.1791 7.223786,7.1291 l 0,14.9628 c 0,3.95 -3.179269,7.1292 -7.223786,7.1292 -4.044516,0 -7.229038,-3.1792 -7.229038,-7.1292 l 0,-14.9628 c 0,-3.95 3.184522,-7.1291 7.229038,-7.1291 z"
id="path5399" />
<rect
ry="0.79848224"
rx="0.79848224"
y="1025.4666"
x="5.5190063"
height="24.945528"
width="33.961983"
id="rect5401"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#8bc34a;stroke-width:1.74663651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
id="path5403"
d="m 11.109664,1043.5389 c 2.495006,2.065 6.666898,3.4226 11.392966,3.4226 4.725665,0 8.89263,-1.3579 11.387713,-3.4226 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#8bc34a;stroke-width:1.74663651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
sodipodi:open="true"
sodipodi:end="3.1415927"
sodipodi:start="0"
transform="matrix(0.1819265,0,0,0.1819265,-43.957774,964.33702)"
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0"
sodipodi:ry="9.388834"
sodipodi:rx="9.388834"
sodipodi:cy="407.66223"
sodipodi:cx="307.48431"
id="path5405"
style="color:#000000;fill:none;stroke:#8bc34a;stroke-width:9.60078144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
transform="matrix(0.1819265,0,0,0.1819265,-21.704758,965.01923)"
sodipodi:type="arc"
style="color:#000000;fill:#8bc34a;fill-opacity:1;fill-rule:nonzero;stroke:#8bc34a;stroke-width:9.60078144000000044;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path5407"
sodipodi:cx="307.48431"
sodipodi:cy="407.66223"
sodipodi:rx="9.388834"
sodipodi:ry="9.388834"
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0 9.388834,9.388834 0 1 1 18.77767,0 z" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
Graphics/drawables/first_time_1.png
View file

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

15
Graphics/drawables/first_time_1.svg
View file

@ -14,7 +14,10 @@
id="svg4325"
version="1.1"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="ok_start.svg">
sodipodi:docname="first_time_1.svg"
inkscape:export-filename="/home/schuerm/Projekte/OpenKeychain/Graphics/drawables/first_time_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4327" />
<sodipodi:namedview
@ -25,7 +28,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="405.16912"
inkscape:cx="314.76047"
inkscape:cy="246.12576"
inkscape:document-units="px"
inkscape:current-layer="layer1"
@ -54,13 +57,13 @@
transform="translate(0,-540.36218)">
<path
sodipodi:type="arc"
style="opacity:0.59999999999999998;fill:#9933cc;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
style="opacity:1;fill:#8bc34a;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path4501"
sodipodi:cx="227.53687"
sodipodi:cy="246.58241"
sodipodi:rx="225.51656"
sodipodi:ry="225.51656"
d="m 453.05342,246.58241 a 225.51656,225.51656 0 1 1 -451.0331106,0 225.51656,225.51656 0 1 1 451.0331106,0 z"
d="m 453.05342,246.58241 c 0,124.54936 -100.9672,225.51656 -225.51655,225.51656 -124.54936,0 -225.5165606,-100.9672 -225.5165606,-225.51656 0,-124.54935 100.9672006,-225.516553 225.5165606,-225.516553 124.54935,0 225.51655,100.967203 225.51655,225.516553 z"
transform="translate(28.463135,549.77977)" />
<path
sodipodi:type="star"
@ -111,7 +114,7 @@
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.12070131;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(0.90538746,0,0,0.90538746,-76.624431,405.57604)"
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0 9.388834,9.388834 0 1 1 18.77767,0 z"
d="m 316.87315,407.66223 c 0,5.18531 -4.20353,9.38884 -9.38884,9.38884 -5.18531,0 -9.38883,-4.20353 -9.38883,-9.38884 0,-5.18531 4.20352,-9.38883 9.38883,-9.38883 5.18531,0 9.38884,4.20352 9.38884,9.38883 z"
sodipodi:ry="9.388834"
sodipodi:rx="9.388834"
sodipodi:cy="407.66223"
@ -128,7 +131,7 @@
sodipodi:cy="407.66223"
sodipodi:rx="9.388834"
sodipodi:ry="9.388834"
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0 9.388834,9.388834 0 1 1 18.77767,0 z" />
d="m 316.87315,407.66223 c 0,5.18531 -4.20353,9.38884 -9.38884,9.38884 -5.18531,0 -9.38883,-4.20353 -9.38883,-9.38884 0,-5.18531 4.20352,-9.38883 9.38883,-9.38883 5.18531,0 9.38884,4.20352 9.38884,9.38883 z" />
<g
id="g10754"
transform="matrix(0.83727181,0,0,0.83727181,829.92363,-416.95697)"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 25 KiB

6
Graphics/update-drawables.sh
View file

@ -70,4 +70,10 @@ for NAME in "drawer_header"
do
echo $NAME
inkscape -w 512 -h 288 -e "$DRAWABLE_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
done
for NAME in "first_time_1"
do
echo $NAME
inkscape -w 512 -h 512 -e "$DRAWABLE_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
done

BIN
OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png
View file

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png
View file

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png
View file

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png
View file

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OpenKeychain/src/main/res/drawable/first_time_1.png
View file

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 39 KiB

10
OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
View file

@ -29,6 +29,11 @@
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/encrypt_text"
android:paddingLeft="8dp"
@ -44,6 +49,11 @@
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"

9
OpenKeychain/src/main/res/layout/first_time_activity.xml
View file

@ -4,6 +4,11 @@
android:layout_height="wrap_content"
android:paddingTop="16dp">
<ImageView
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusbar_margin" />
<LinearLayout
android:id="@+id/first_time_buttons"
android:layout_width="match_parent"
@ -91,6 +96,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_below="@+id/status_bar"
android:layout_above="@+id/first_time_buttons">
<TextView
@ -99,7 +105,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/app_name"
android:drawableLeft="@drawable/ic_launcher"
android:drawablePadding="16dp"
android:drawablePadding="8dp"
android:gravity="center"
android:layout_gravity="center_horizontal" />
@ -128,5 +134,4 @@
</LinearLayout>
</RelativeLayout>