]> git.ktnx.net Git - mobile-ledger.git/commitdiff
better shortcut icon
authorDamyan Ivanov <dam+mobileledger@ktnx.net>
Thu, 18 Jun 2020 16:45:32 +0000 (19:45 +0300)
committerDamyan Ivanov <dam+mobileledger@ktnx.net>
Thu, 18 Jun 2020 17:02:59 +0000 (17:02 +0000)
this one is visible on light and dark background

app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
app/src/main/res/drawable-anydpi-v21/svg_thick_plus_white.xml [deleted file]
app/src/main/res/drawable/thick_plus_icon.xml [new file with mode: 0644]
art/thick-plus-icon.svg [new file with mode: 0644]

index 98ec7aaa524ab7bf26dfed6db181119d7f1a68c7..cad021770fa25866bb17b1705a527606c0d30504 100644 (file)
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -352,23 +352,16 @@ public class MainActivity extends ProfileThemedActivity {
             if (!p.isPostingPermitted())
                 continue;
 
             if (!p.isPostingPermitted())
                 continue;
 
-            ShortcutInfo si =
-                    new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()).setShortLabel(
-                            p.getName())
-                                                                                    .setIcon(
-                                                                                            Icon.createWithResource(
-                                                                                                    this,
-                                                                                                    R.drawable.svg_thick_plus_white))
-                                                                                    .setIntent(
-                                                                                            new Intent(
-                                                                                                    Intent.ACTION_VIEW,
-                                                                                                    null,
-                                                                                                    this,
-                                                                                                    NewTransactionActivity.class).putExtra(
-                                                                                                    "profile_uuid",
-                                                                                                    p.getUuid()))
-                                                                                    .setRank(i)
-                                                                                    .build();
+            final ShortcutInfo.Builder builder =
+                    new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid());
+            ShortcutInfo si = builder.setShortLabel(p.getName())
+                                     .setIcon(Icon.createWithResource(this,
+                                             R.drawable.thick_plus_icon))
+                                     .setIntent(new Intent(Intent.ACTION_VIEW, null, this,
+                                             NewTransactionActivity.class).putExtra("profile_uuid",
+                                             p.getUuid()))
+                                     .setRank(i)
+                                     .build();
             shortcuts.add(si);
             i++;
         }
             shortcuts.add(si);
             i++;
         }
diff --git a/app/src/main/res/drawable-anydpi-v21/svg_thick_plus_white.xml b/app/src/main/res/drawable-anydpi-v21/svg_thick_plus_white.xml
deleted file mode 100644 (file)
index ca2839e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © 2019 Damyan Ivanov.
-  ~ This file is part of MoLe.
-  ~ MoLe is free software: you can distribute it and/or modify it
-  ~ under the term of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your opinion), any later version.
-  ~
-  ~ MoLe is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License terms for details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="6.4"
-    android:viewportHeight="6.4">
-    <group
-        android:name="layer1"
-        android:translateX="0"
-        android:translateY="-290.65">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="m 3.1750002 290.64999 c -0.5675775 0 -1.0245037 0.45692 -1.0245037 1.0245 v 1.12599 H 1.0245036 c -0.56757673 0 -1.024503652878986 0.45693 -1.024503652878986 1.02451 0 0.56757 0.456926922878986 1.0245 1.024503652878986 1.0245 h 1.1259929 v 1.12599 c 0 0.56758 0.4569262 1.02451 1.0245037 1.02451 0.5675774 0 1.0245036 -0.45693 1.0245036 -1.02451 v -1.12599 h 1.1259929 c 0.5675768 0 1.0245034 -0.45693 1.0245034 -1.0245 0 -0.56758 -0.4569266 -1.02451 -1.0245034 -1.02451 H 4.1995038 v -1.12599 c 0 -0.56758 -0.4569262 -1.0245 -1.0245036 -1.0245 z" />
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thick_plus_icon.xml b/app/src/main/res/drawable/thick_plus_icon.xml
new file mode 100644 (file)
index 0000000..c7a14de
--- /dev/null
@@ -0,0 +1,51 @@
+<!--
+  ~ Copyright © 2020 Damyan Ivanov.
+  ~ This file is part of MoLe.
+  ~ MoLe is free software: you can distribute it and/or modify it
+  ~ under the term of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your opinion), any later version.
+  ~
+  ~ MoLe is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU General Public License terms for details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:autoMirrored="true"
+    android:viewportWidth="100"
+    android:viewportHeight="100"
+    >
+    <path
+        android:fillColor="#ededed"
+        android:pathData="M50,50m-35,0a35,35 0,1 1,70 0a35,35 0,1 1,-70 0"
+        android:strokeWidth="0.370416"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="bevel"
+        />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M50.19,35V65"
+        android:strokeWidth="9"
+        android:strokeColor="#935ff2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="miter"
+        />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M35,50L65,50"
+        android:strokeWidth="9"
+        android:strokeColor="#935ff2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="miter"
+        />
+</vector>
diff --git a/art/thick-plus-icon.svg b/art/thick-plus-icon.svg
new file mode 100644 (file)
index 0000000..a10e929
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:xlink="http://www.w3.org/1999/xlink" height="100mm" id="svg8" version="1.1"
+    viewBox="0 0 100 100" width="100mm" xmlns="http://www.w3.org/2000/svg"
+    inkscape:version="1.0 (4035a4fb49, 2020-05-01)" sodipodi:docname="thick-plus-icon.svg">
+  <defs id="defs2" />
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" pagecolor="#ffffff"
+      showgrid="false" inkscape:current-layer="layer1" inkscape:cx="188.97638"
+      inkscape:cy="188.97639" inkscape:document-rotation="0" inkscape:document-units="mm"
+      inkscape:pagecheckerboard="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2"
+      inkscape:window-height="1022" inkscape:window-maximized="1" inkscape:window-width="1920"
+      inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="2" />
+  <metadata id="metadata5">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Слой 1">
+    <circle
+        style="fill:#ededed;fill-opacity:1;stroke:none;stroke-width:0.370416;stroke-linecap:round;stroke-linejoin:bevel;paint-order:markers stroke fill"
+        cx="50" cy="50" id="path833" r="35" />
+    <path
+        style="fill:none;fill-rule:evenodd;stroke:#935ff2;stroke-width:9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="M 50.18969,35 V 65" id="path835" />
+    <use style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" height="100%" id="use919"
+        transform="rotate(-90,50.094845,50.094845)" width="100%" x="0" y="0"
+        xlink:href="#path835" />
+  </g>
+</svg>