From e29ea517daeb660fd91582b53ae0e5e67d50efe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 19:13:02 +0100
Subject: Fix first time wizard design

---
 Graphics/drawables/create_key_robot.svg            |  95 ++++++++++-----------
 Graphics/drawables/first_time_1.png                | Bin 43898 -> 0 bytes
 Graphics/drawables/first_time_1.svg                |  15 ++--
 Graphics/update-drawables.sh                       |   6 ++
 .../main/res/drawable-hdpi/create_key_robot.png    | Bin 2259 -> 2299 bytes
 .../main/res/drawable-mdpi/create_key_robot.png    | Bin 1766 -> 1767 bytes
 .../main/res/drawable-xhdpi/create_key_robot.png   | Bin 3176 -> 3153 bytes
 .../main/res/drawable-xxhdpi/create_key_robot.png  | Bin 4039 -> 4030 bytes
 .../src/main/res/drawable/first_time_1.png         | Bin 43898 -> 40232 bytes
 .../layout/encrypt_decrypt_overview_fragment.xml   |  10 +++
 .../src/main/res/layout/first_time_activity.xml    |   9 +-
 11 files changed, 78 insertions(+), 57 deletions(-)
 delete mode 100644 Graphics/drawables/first_time_1.png

diff --git a/Graphics/drawables/create_key_robot.svg b/Graphics/drawables/create_key_robot.svg
index 7301dc5bb..ac951c8e5 100644
--- a/Graphics/drawables/create_key_robot.svg
+++ b/Graphics/drawables/create_key_robot.svg
@@ -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>
diff --git a/Graphics/drawables/first_time_1.png b/Graphics/drawables/first_time_1.png
deleted file mode 100644
index 1f340df5c..000000000
Binary files a/Graphics/drawables/first_time_1.png and /dev/null differ
diff --git a/Graphics/drawables/first_time_1.svg b/Graphics/drawables/first_time_1.svg
index 1f40c5ff3..eb44a8b8f 100644
--- a/Graphics/drawables/first_time_1.svg
+++ b/Graphics/drawables/first_time_1.svg
@@ -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)"
diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh
index 264f7eea6..750a6ee97 100755
--- a/Graphics/update-drawables.sh
+++ b/Graphics/update-drawables.sh
@@ -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
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png
index acc198fc3..2d16b50cf 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png
index 58476bfc9..08168f357 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png
index 022f2dd2e..a7d43e3b7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png
index 5392deafd..0e3432635 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable/first_time_1.png b/OpenKeychain/src/main/res/drawable/first_time_1.png
index 1f340df5c..1f93f2deb 100644
Binary files a/OpenKeychain/src/main/res/drawable/first_time_1.png and b/OpenKeychain/src/main/res/drawable/first_time_1.png differ
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index 465fd195e..d62c9f32b 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -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"
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 2d750c1a7..61737e548 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -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>
-- 
cgit v1.2.3