replace icons by vector drawables to fix color issues with day/night scheme
							
								
								
									
										41
									
								
								graphics/donate_beer.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,41 @@ | ||||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||||
| <svg | ||||
|    viewBox="0 0 24 24" | ||||
|    id="vector" | ||||
|    version="1.1" | ||||
|    sodipodi:docname="donate_beer.svg" | ||||
|    inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" | ||||
|    xml:space="preserve" | ||||
|    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||||
|    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||||
|    xmlns="http://www.w3.org/2000/svg" | ||||
|    xmlns:svg="http://www.w3.org/2000/svg"><defs | ||||
|      id="defs1" /><sodipodi:namedview | ||||
|      id="namedview1" | ||||
|      pagecolor="#ffffff" | ||||
|      bordercolor="#000000" | ||||
|      borderopacity="0.25" | ||||
|      inkscape:showpageshadow="2" | ||||
|      inkscape:pageopacity="0.0" | ||||
|      inkscape:pagecheckerboard="0" | ||||
|      inkscape:deskcolor="#d1d1d1" | ||||
|      inkscape:zoom="23.953242" | ||||
|      inkscape:cx="-2.1708961" | ||||
|      inkscape:cy="8.5792145" | ||||
|      inkscape:window-width="1920" | ||||
|      inkscape:window-height="1009" | ||||
|      inkscape:window-x="-8" | ||||
|      inkscape:window-y="-8" | ||||
|      inkscape:window-maximized="1" | ||||
|      inkscape:current-layer="vector" /><path | ||||
|      d="m 19.122138,7.2306214 h -1.653647 c 0.297658,-0.6614585 0.46302,-1.0583336 0.46302,-1.6205737 0,-1.5213554 -1.2237,-2.778126 -2.71198,-2.8442725 -0.595314,-0.7606784 -1.521356,-1.2237001 -2.513544,-1.2237001 -0.628386,0 -1.2237,0.1653664 -1.752865,0.496095 -0.66146,-0.595312 -1.4882844,-1.09140704 -2.4144154,-1.09140704 -1.2567704,0 -2.4803818,0.79375024 -3.1750024,1.81892344 -1.2898439,0.2315116 -2.2821211,1.3890637 -2.2821211,2.7449667 0,0.7606771 0.2976567,1.4552087 0.8268236,1.9843756 V 21.121082 c 0,0.56224 0.3638031,0.992188 0.8929686,0.992188 H 16.145308 c 0.56224,0 0.992188,-0.429948 0.992188,-0.992188 v -1.322918 h 1.984377 c 0.926043,0 1.653646,-0.859896 1.653646,-1.752866 V 8.7187289 c 0,-0.9260419 -0.760676,-1.4882835 -1.653646,-1.4882835 z m -2.742001,3.4534426 -0.403803,6.23289 1.161425,0.235551 z M 8.5387954,1.9389516 c 1.0252612,0 1.8852456,0.6945319 2.3480906,1.5213555 0.396876,-0.5622402 1.058335,-0.9591153 1.818925,-0.9591153 0.79375,0 1.521354,0.4299469 1.885246,1.0914069 0.03307,0.066146 0.06615,0.09922 0.09922,0.1653651 0.132293,-0.033074 0.264583,-0.066146 0.429949,-0.066146 0.992188,0 1.818922,0.7937502 1.818922,1.8189248 0,0.6283853 -0.297656,1.157552 -0.79375,1.4882805 -0.297657,0.1984382 -0.628386,0.33073 -1.025262,0.33073 -0.562239,0 -1.058334,-0.2645835 -1.389064,-0.6614585 -0.297656,0.1653651 -0.661458,0.2645848 -1.025259,0.2645848 -0.661459,0 -1.289848,-0.297658 -1.686721,-0.7937515 C 10.556071,7.0651695 9.5969562,7.7266281 8.5055494,7.7266281 7.8440909,7.7266281 7.2157042,7.495118 6.752684,7.0982428 6.4881014,7.2305357 6.223518,7.3297527 5.8927893,7.3297527 5.5289861,7.3297527 5.1982576,7.2305331 4.9006008,7.032096 4.4045017,6.7013675 4.073773,6.1391272 4.073773,5.510742 c 0,-0.99219 0.7937503,-1.8189248 1.8189234,-1.8189248 h 0.066146 c 0.033074,-0.033074 0.033074,-0.09922 0.066147,-0.1322931 0.4630217,-0.8598969 1.4552103,-1.620574 2.513544,-1.620574 z M 7.0663448,10.173751 C 7.3454436,9.6502765 7.6191839,9.77712 7.850694,9.7109719 c 0.7287987,-0.097569 -0.2443734,0.033155 0.4171739,0.033155 1.0583336,0 -0.3223139,-0.092452 0.4673072,-0.058644 0.9864968,-0.054022 0.2018914,-0.2044859 0.7061633,-0.044083 0.6347356,0.2019011 0.6968396,0.5726311 0.9614236,0.5064841 0.463021,0.330729 0.963735,-0.3189756 1.525975,-0.3189756 0.363803,0 0.835316,-0.4743211 1.557892,0.1118782 L 14.664387,10.833358 14.395185,14.364324 10.64269,17.493095 9.1598621,15.996034 7.5547275,14.287026 C 7.8523853,14.419319 6.3897465,11.864369 6.6189488,10.45106 Z m -2.1655736,10.947507 0.095178,0.247507 H 16.193161 l -0.04759,-0.247507 z M 19.439483,17.51402 c 0.0013,0.363801 -0.297718,0.767343 -0.661459,0.760677 l -1.610745,-0.02952 0.02379,-0.611478 c -0.03594,-3.690037 -0.05332,-2.690499 -0.05332,-8.9386516 l 1.610745,3e-7 c 0.363802,10e-8 0.660168,0.1322954 0.661459,0.496095 z" | ||||
|      id="path4" | ||||
|      style="stroke-width:0.0176389" | ||||
|      sodipodi:nodetypes="ccscscscscsssscsssccccccscsccsssscscscssssccssccscscscccccccccccccsscccsss" /><g | ||||
|      style="fill:none" | ||||
|      id="g1" | ||||
|      transform="matrix(0.46698189,0,0,0.46698189,15.656847,1.4036426)"><path | ||||
|        d="m -10.266621,19.230782 c 0.9810002,-1.152 2.4840002,-1.881 4.0500002,-1.881 2.772,0 4.95,2.178 4.95,4.95 0,3.3992 -3.055,6.1695 -7.6836,10.3667 l -0.0114,0.0103 -1.3050002,1.188 -1.305,-1.179 -0.0355,-0.0323 c -4.61513,-4.1939 -7.6595,-6.9604 -7.6595,-10.3537 0,-2.772 2.178,-4.95 4.95,-4.95 1.566,0 3.069,0.729 4.05,1.881 z" | ||||
|        fill="#000000" | ||||
|        id="path1" | ||||
|        style="fill:none;stroke:#000000;stroke-width:1.97721;stroke-dasharray:none" /></g></svg> | ||||
| After Width: | Height: | Size: 4.5 KiB | 
| @@ -24,7 +24,7 @@ namespace keepass2android | ||||
| 		{  | ||||
| 			get | ||||
| 			{ | ||||
| 				return _context.Resources.GetDrawable(Resource.Drawable.ic_menu_copy_holo_dark); | ||||
| 				return _context.Resources.GetDrawable(Resource.Drawable.baseline_content_copy_24); | ||||
| 			} | ||||
| 		} | ||||
| 		public string Text | ||||
|   | ||||
| @@ -20,7 +20,7 @@ namespace keepass2android | ||||
|  | ||||
| 		public Drawable Icon | ||||
| 		{ | ||||
| 			get { return _ctx.Resources.GetDrawable(Resource.Drawable.ic_menu_upload_grey); } | ||||
| 			get { return _ctx.Resources.GetDrawable(Resource.Drawable.baseline_upload_24); } | ||||
| 		} | ||||
|  | ||||
| 		public string Text | ||||
|   | ||||
| @@ -19,7 +19,7 @@ namespace keepass2android | ||||
|  | ||||
| 		public Drawable Icon | ||||
| 		{ | ||||
| 			get { return _entryActivity.Resources.GetDrawable(Resource.Drawable.ic_menu_share_grey); } | ||||
| 			get { return _entryActivity.Resources.GetDrawable(Resource.Drawable.baseline_share_24); } | ||||
| 		} | ||||
|  | ||||
| 		public string Text | ||||
|   | ||||
| @@ -24,7 +24,7 @@ namespace keepass2android | ||||
| 			get | ||||
| 			{ | ||||
| 				//return new TextDrawable("\uF06E", _activity); | ||||
| 				return _activity.Resources.GetDrawable(Resource.Drawable.ic_menu_view_grey); | ||||
| 				return _activity.Resources.GetDrawable(Resource.Drawable.baseline_visibility_24); | ||||
| 				 | ||||
| 			} | ||||
| 		} | ||||
|   | ||||
| @@ -29,7 +29,7 @@ namespace keepass2android.EntryActivityClasses | ||||
| 		{ | ||||
| 			get | ||||
| 			{ | ||||
| 				 return _entryActivity.Resources.GetDrawable(Resource.Drawable.ic_picture);  | ||||
| 				 return _entryActivity.Resources.GetDrawable(Resource.Drawable.baseline_image_24);  | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
|   | ||||
| @@ -19,7 +19,7 @@ namespace keepass2android | ||||
|  | ||||
| 		public Drawable Icon | ||||
| 		{ | ||||
| 			get { return _activity.Resources.GetDrawable(Resource.Drawable.ic_menu_save_grey); } | ||||
| 			get { return _activity.Resources.GetDrawable(Resource.Drawable.baseline_save_24); } | ||||
| 		} | ||||
|  | ||||
| 		public string Text | ||||
|   | ||||
| @@ -41,6 +41,7 @@ using Android.Graphics; | ||||
| using Android.Graphics.Drawables; | ||||
| using Android.Runtime; | ||||
| using Android.Util; | ||||
| using Google.Android.Material.Dialog; | ||||
| using keepass2android.Io; | ||||
| using KeePassLib.Serialization; | ||||
| using KeeTrayTOTP.Libraries; | ||||
| @@ -262,15 +263,12 @@ namespace keepass2android | ||||
| 			// Respect mask password setting | ||||
| 			MakePasswordVisibleOrHidden(); | ||||
|  | ||||
| 			ImageButton btnTogglePassword = (ImageButton)FindViewById(Resource.Id.toggle_password); | ||||
| 			Button btnTogglePassword = (Button)FindViewById(Resource.Id.toggle_password); | ||||
| 			btnTogglePassword.Click += (sender, e) => | ||||
| 			{ | ||||
| 				State.ShowPassword = !State.ShowPassword; | ||||
| 				MakePasswordVisibleOrHidden(); | ||||
| 			}; | ||||
| 			PorterDuff.Mode mMode = PorterDuff.Mode.SrcAtop; | ||||
| 			Color color = new Color (189,189,189); | ||||
| 			btnTogglePassword.SetColorFilter (color, mMode); | ||||
|  | ||||
|  | ||||
| 			Button addButton = (Button) FindViewById(Resource.Id.add_advanced); | ||||
| @@ -355,7 +353,7 @@ namespace keepass2android | ||||
|  | ||||
| 	        if (State.Entry.Binaries.Get(strItem) != null) | ||||
| 	        { | ||||
| 	            AlertDialog.Builder builder = new AlertDialog.Builder(this); | ||||
|                 MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); | ||||
| 	            builder.SetTitle(GetString(Resource.String.AskOverwriteBinary_title)); | ||||
|  | ||||
| 	            builder.SetMessage(GetString(Resource.String.AskOverwriteBinary)); | ||||
| @@ -769,7 +767,7 @@ namespace keepass2android | ||||
| 				base.OnBackPressed(); | ||||
| 			} else | ||||
| 			{ | ||||
| 				AlertDialog.Builder builder = new AlertDialog.Builder(this); | ||||
| 				MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); | ||||
| 				builder.SetTitle(GetString(Resource.String.AskDiscardChanges_title)); | ||||
| 				 | ||||
| 				builder.SetMessage(GetString(Resource.String.AskDiscardChanges)); | ||||
| @@ -1132,7 +1130,7 @@ namespace keepass2android | ||||
| 		 | ||||
|         private void EditTotpString(View sender) | ||||
|         { | ||||
|             AlertDialog.Builder builder = new AlertDialog.Builder(this); | ||||
|             MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); | ||||
|             View dlgView = LayoutInflater.Inflate(Resource.Layout. | ||||
|                 configure_totp_dialog, null); | ||||
|  | ||||
| @@ -1337,7 +1335,7 @@ namespace keepass2android | ||||
|  | ||||
|         private void EditAdvancedString(View sender) | ||||
| 		{ | ||||
| 			AlertDialog.Builder builder = new AlertDialog.Builder(this); | ||||
| 			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); | ||||
| 			View dlgView = LayoutInflater.Inflate(Resource.Layout. | ||||
| 				edit_extra_string_dialog, null); | ||||
|  | ||||
| @@ -1356,7 +1354,7 @@ namespace keepass2android | ||||
|  | ||||
| 			//setup delete button: | ||||
| 			var deleteButton = dlgView.FindViewById<Button>(Resource.Id.delete_extra); | ||||
| 			deleteButton.SetCompoundDrawablesWithIntrinsicBounds(Resources.GetDrawable(Resource.Drawable.ic_menu_delete), null, null, null); | ||||
| 			deleteButton.SetCompoundDrawablesWithIntrinsicBounds(Resources.GetDrawable(Resource.Drawable.baseline_delete_24), null, null, null); | ||||
| 			deleteButton.Click += (o, args) => | ||||
| 				{ | ||||
| 					DeleteAdvancedString(sender); | ||||
|   | ||||
| @@ -307,7 +307,7 @@ namespace keepass2android | ||||
| 			_fpTextView.SetTextColor( | ||||
| 				_fpTextView.Resources.GetColor(Resource.Color.md_theme_secondary, null)); | ||||
| 			_fpTextView.Text = ""; | ||||
| 			_fpIcon.SetImageResource(Resource.Drawable.ic_fp_40px); | ||||
| 			_fpIcon.SetImageResource(Resource.Drawable.baseline_fingerprint_24); | ||||
| 		} | ||||
|  | ||||
| 		protected override void OnResume() | ||||
|   | ||||
| @@ -643,6 +643,12 @@ namespace keepass2android | ||||
|                     FindViewById(Resource.Id.fabCancelAddNew).Visibility = ViewStates.Visible; | ||||
|                     FindViewById(Resource.Id.fabAddNewGroup).Visibility = AddGroupEnabled ? ViewStates.Visible : ViewStates.Gone; | ||||
|                     FindViewById(Resource.Id.fabAddNewEntry).Visibility = AddEntryEnabled ? ViewStates.Visible : ViewStates.Gone; | ||||
|                     FindViewById<Google.Android.Material.FloatingActionButton.ExtendedFloatingActionButton>(Resource.Id | ||||
|                         .fabAddNewEntry).Shrink(); | ||||
|                     FindViewById<Google.Android.Material.FloatingActionButton.ExtendedFloatingActionButton>(Resource.Id | ||||
|                         .fabAddNewGroup).Extended = false; | ||||
|                     FindViewById<Google.Android.Material.FloatingActionButton.ExtendedFloatingActionButton>(Resource.Id | ||||
|                         .fabAddNewGroup).Extend(); | ||||
|                     FindViewById(Resource.Id.fabAddNew).Visibility = ViewStates.Gone; | ||||
|                     FindViewById(Resource.Id.fabSearch).Visibility = ViewStates.Gone; | ||||
|                     FindViewById(Resource.Id.fabTotpOverview).Visibility = ViewStates.Gone; | ||||
|   | ||||
| @@ -953,7 +953,7 @@ namespace keepass2android | ||||
| 			btn.SetImageResource(Resource.Drawable.ic_fingerprint_error); | ||||
| 			btn.PostDelayed(() => | ||||
| 			{ | ||||
| 				btn.SetImageResource(Resource.Drawable.ic_fp_40px); | ||||
| 				btn.SetImageResource(Resource.Drawable.baseline_fingerprint_24); | ||||
|             }, 1300); | ||||
| 			Toast.MakeText(this, message, ToastLength.Long).Show(); | ||||
| 		} | ||||
| @@ -1931,7 +1931,7 @@ namespace keepass2android | ||||
|  | ||||
| 				if (_biometricDec.Init()) | ||||
| 				{ | ||||
| 					btn.SetImageResource(Resource.Drawable.ic_fp_40px); | ||||
| 					btn.SetImageResource(Resource.Drawable.baseline_fingerprint_24); | ||||
| 					_biometricDec.StartListening(new BiometricAuthCallbackAdapter(this, this)); | ||||
| 					return true; | ||||
| 				} | ||||
|   | ||||
| @@ -198,7 +198,7 @@ namespace keepass2android | ||||
| 			btn.SetImageResource(Resource.Drawable.ic_fingerprint_error); | ||||
| 			btn.PostDelayed(() => | ||||
| 			{ | ||||
| 				btn.SetImageResource(Resource.Drawable.ic_fp_40px); | ||||
| 				btn.SetImageResource(Resource.Drawable.baseline_fingerprint_24); | ||||
| 				 | ||||
| 			}, 1300); | ||||
| 			Toast.MakeText(this, message, ToastLength.Long).Show(); | ||||
| @@ -281,7 +281,7 @@ namespace keepass2android | ||||
| 				if (_biometryIdentifier.Init()) | ||||
| 				{ | ||||
| 					Kp2aLog.Log("successfully initialized fingerprint."); | ||||
| 					btn.SetImageResource(Resource.Drawable.ic_fp_40px); | ||||
| 					btn.SetImageResource(Resource.Drawable.baseline_fingerprint_24); | ||||
| 					_biometryIdentifier.StartListening(this); | ||||
| 					return true; | ||||
| 				} | ||||
|   | ||||
| Before Width: | Height: | Size: 642 B | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 14 KiB | 
| Before Width: | Height: | Size: 14 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 5.4 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 5.8 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 9.9 KiB | 
| Before Width: | Height: | Size: 8.3 KiB | 
| Before Width: | Height: | Size: 3.3 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 14 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 145 B | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 284 B | 
| Before Width: | Height: | Size: 14 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 298 B | 
| Before Width: | Height: | Size: 504 B | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 1.2 KiB | 
| Before Width: | Height: | Size: 1.4 KiB | 
| Before Width: | Height: | Size: 16 KiB | 
 Philipp Crocoll
					Philipp Crocoll