Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Wallet
sentinel-android
Commits
6f6ceb48
Verified
Commit
6f6ceb48
authored
Oct 31, 2019
by
Sarath
⚔
Browse files
[FIX] broken share option menu in receive activity
parent
ecdff3f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
5 deletions
+25
-5
app/src/main/java/com/samourai/sentinel/ReceiveActivity.java
app/src/main/java/com/samourai/sentinel/ReceiveActivity.java
+2
-5
app/src/main/res/drawable/ic_share_24dp.xml
app/src/main/res/drawable/ic_share_24dp.xml
+5
-0
app/src/main/res/menu/receive_menu.xml
app/src/main/res/menu/receive_menu.xml
+18
-0
No files found.
app/src/main/java/com/samourai/sentinel/ReceiveActivity.java
View file @
6f6ceb48
...
...
@@ -18,6 +18,7 @@ import android.support.v4.content.FileProvider;
import
android.support.v4.content.LocalBroadcastManager
;
import
android.text.Editable
;
import
android.text.TextWatcher
;
import
android.util.Log
;
import
android.view.Display
;
import
android.view.Menu
;
import
android.view.MenuItem
;
...
...
@@ -314,11 +315,7 @@ public class ReceiveActivity extends Activity {
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
getMenuInflater
().
inflate
(
R
.
menu
.
main
,
menu
);
// menu.findItem(R.id.action_sweep).setVisible(false);
menu
.
findItem
(
R
.
id
.
action_settings
).
setVisible
(
false
);
menu
.
findItem
(
R
.
id
.
action_sweep
).
setVisible
(
false
);
getMenuInflater
().
inflate
(
R
.
menu
.
receive_menu
,
menu
);
MenuItem
itemShare
=
menu
.
findItem
(
R
.
id
.
action_share_receive
).
setVisible
(
true
);
itemShare
.
setOnMenuItemClickListener
(
new
MenuItem
.
OnMenuItemClickListener
()
{
...
...
app/src/main/res/drawable/ic_share_24dp.xml
0 → 100644
View file @
6f6ceb48
<vector
android:height=
"24dp"
android:tint=
"#FFFFFF"
android:viewportHeight=
"24.0"
android:viewportWidth=
"24.0"
android:width=
"24dp"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"
/>
</vector>
app/src/main/res/menu/receive_menu.xml
0 → 100755
View file @
6f6ceb48
<menu
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
tools:context=
".MainActivity"
>
<item
android:id=
"@+id/action_share_receive"
android:icon=
"@drawable/ic_share_24dp"
android:visible=
"true"
android:title=
""
android:showAsAction=
"always"
app:showAsAction=
"always"
/>
<item
android:id=
"@+id/action_refresh"
android:icon=
"@drawable/ic_action_refresh"
android:visible=
"true"
android:title=
""
android:showAsAction=
"always"
app:showAsAction=
"always"
/>
</menu>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment