diff options
author | Torsten Grote <t@grobox.de> | 2020-03-05 15:52:44 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-03-05 15:52:44 -0300 |
commit | 09b66e71b0fa0fd24ad3c4196ff545faaad6da14 (patch) | |
tree | dcd18dd651df1e86f9c53b705eb2445a3fcab28e /app/src | |
parent | 44693dd2742c14136fada73c777f14d62f326f8d (diff) | |
download | wallet-android-09b66e71b0fa0fd24ad3c4196ff545faaad6da14.tar.gz wallet-android-09b66e71b0fa0fd24ad3c4196ff545faaad6da14.tar.bz2 wallet-android-09b66e71b0fa0fd24ad3c4196ff545faaad6da14.zip |
Use better icons for navigation drawer menu
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/res/drawable/ic_account_balance_wallet.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/drawable/ic_menu_manage.xml | 25 | ||||
-rw-r--r-- | app/src/main/res/drawable/ic_settings.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/drawable/ic_sync.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/layout/nav_header_main.xml | 22 | ||||
-rw-r--r-- | app/src/main/res/menu/activity_main_drawer.xml | 13 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
7 files changed, 45 insertions, 45 deletions
diff --git a/app/src/main/res/drawable/ic_account_balance_wallet.xml b/app/src/main/res/drawable/ic_account_balance_wallet.xml new file mode 100644 index 0000000..514b118 --- /dev/null +++ b/app/src/main/res/drawable/ic_account_balance_wallet.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M21,18v1c0,1.1 -0.9,2 -2,2L5,21c-1.11,0 -2,-0.9 -2,-2L3,5c0,-1.1 0.89,-2 2,-2h14c1.1,0 2,0.9 2,2v1h-9c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h9zM12,16h10L22,8L12,8v8zM16,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_menu_manage.xml b/app/src/main/res/drawable/ic_menu_manage.xml deleted file mode 100644 index f104384..0000000 --- a/app/src/main/res/drawable/ic_menu_manage.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ This file is part of GNU Taler - ~ (C) 2020 Taler Systems S.A. - ~ - ~ GNU Taler is free software; you can redistribute it and/or modify it under the - ~ terms of the GNU General Public License as published by the Free Software - ~ Foundation; either version 3, or (at your option) any later version. - ~ - ~ GNU Taler 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 for more details. - ~ - ~ You should have received a copy of the GNU General Public License along with - ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/> -</vector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..7cadd58 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF000000" + android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml new file mode 100644 index 0000000..78593fc --- /dev/null +++ b/app/src/main/res/drawable/ic_sync.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" /> +</vector> diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 37559fb..f21d6a3 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- ~ This file is part of GNU Taler ~ (C) 2020 Taler Systems S.A. ~ @@ -15,19 +14,18 @@ ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/nav_header_height" android:background="@drawable/side_nav_bar" - android:paddingBottom="@dimen/activity_vertical_margin" + android:gravity="bottom" + android:orientation="vertical" android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - android:theme="@style/ThemeOverlay.AppCompat.Dark" - android:orientation="vertical" - android:gravity="bottom"> + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/activity_vertical_margin" + android:theme="@style/ThemeOverlay.AppCompat.Dark"> <ImageView android:id="@+id/imageView" @@ -43,12 +41,12 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/nav_header_vertical_spacing" android:text="@string/nav_header_title" - android:textAppearance="@style/TextAppearance.AppCompat.Body1"/> + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> <TextView + android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/nav_header_subtitle" - android:id="@+id/textView"/> + android:text="@string/nav_header_subtitle" /> </LinearLayout> diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 7a54077..5eee6cc 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -16,25 +16,26 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - tools:showIn="navigation_view"> + tools:showIn="@layout/activity_main"> <group android:checkableBehavior="single"> <item android:id="@+id/nav_home" - android:icon="@drawable/ic_home_black_24dp" - android:title="@string/menu_home" /> + android:icon="@drawable/ic_account_balance_wallet" + android:title="@string/balances_title" + tools:checked="true" /> <item android:id="@+id/nav_history" android:icon="@drawable/ic_history_black_24dp" android:title="@string/menu_history" /> <item android:id="@+id/nav_settings" - android:icon="@drawable/ic_menu_manage" + android:icon="@drawable/ic_settings" android:title="@string/menu_settings" /> <item android:id="@+id/nav_pending_operations" - android:icon="@drawable/history_refresh" - android:title="Pending Operations" /> + android:icon="@drawable/ic_sync" + android:title="@string/pending_operations_title" /> </group> </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a5ff395..b8f41fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,7 +28,6 @@ <string name="button_cancel">Cancel</string> <string name="button_scan_qr_code">Scan Taler QR Code</string> - <string name="menu_home">Home</string> <string name="menu_history">History</string> <string name="menu_settings">Settings</string> <string name="menu_balance_reload">Reload balances</string> @@ -86,7 +85,7 @@ <string name="withdraw_button_testkudos">Withdraw TESTKUDOS</string> <string name="withdraw_button_confirm">Confirm Withdraw</string> - <string name="pending_operations_label">Pending Operations:</string> + <string name="pending_operations_title">Pending Operations</string> <string name="pending_operations_refuse">Refuse Proposal</string> <string name="pending_operations_no_action">(no action)</string> |