Skip to content

Commit 6ae7cff

Browse files
timscriptovtimscriptov
committed
Fix
1 parent c6d38a2 commit 6ae7cff

File tree

18 files changed

+147
-73
lines changed

18 files changed

+147
-73
lines changed

‎app/src/main/java/com/mcal/disassembler/activities/ClassActivity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void onCreate(Bundle savedInstanceState) {
8080
setTitle(name);
8181

8282
if (hasVtable()) {
83-
findViewById(R.id.classactivityTextViewButtonFloatVtable).setVisibility(View.VISIBLE);
8483
findViewById(R.id.classactivityButtonFloat).setVisibility(View.VISIBLE);
8584
}
8685
}

‎app/src/main/java/com/mcal/disassembler/activities/SymbolsActivity.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.mcal.disassembler.R;
2525
import com.mcal.disassembler.nativeapi.Dumper;
2626
import com.mcal.disassembler.util.FileSaver;
27+
import com.mcal.disassembler.view.FloatingButton;
2728
import com.mcal.materialdesign.view.CenteredToolBar;
2829
import com.mcal.materialdesign.widgets.SnackBar;
2930

@@ -98,6 +99,10 @@ else if (Dumper.symbols.get(i).getType() == 2)
9899
return list;
99100
}
100101

102+
public void showFloatingMenu(View view) {
103+
new FloatingButton(this, path).show();
104+
}
105+
101106
public void showSearch(View view) {
102107
Intent i = new Intent(this, SearchActivity.class);
103108
Bundle bundle = new Bundle();

‎app/src/main/res/drawable/ic_menu.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!-- drawable/menu.xml -->
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:height="24dp"
4+
android:width="24dp"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
<path android:fillColor="#000" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
8+
</vector>

‎app/src/main/res/drawable/ic_minimize.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:height="24dp"
3+
android:width="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path android:fillColor="#000" android:pathData="M3, 21H21V19H3, M5,7H, M5,3H3" />
7+
</vector>

‎app/src/main/res/layout/class_activity.xml‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,38 @@
3131

3232
</LinearLayout>
3333

34-
<androidx.appcompat.widget.AppCompatTextView
35-
android:id="@+id/classactivityTextViewButtonFloatVtable"
36-
android:layout_width="wrap_content"
37-
android:layout_height="wrap_content"
38-
android:layout_alignParentEnd="true"
39-
android:layout_alignParentBottom="true"
40-
android:layout_marginEnd="90dp"
41-
android:layout_marginBottom="120dp"
42-
android:background="#CCCCCC"
43-
android:text="@string/ownedVtable"
44-
android:visibility="gone" />
45-
46-
<com.google.android.material.floatingactionbutton.FloatingActionButton
34+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
4735
android:id="@+id/classactivityButtonFloat"
48-
android:layout_width="wrap_content"
36+
android:layout_width="130dp"
4937
android:layout_height="wrap_content"
5038
android:layout_alignParentEnd="true"
5139
android:layout_alignParentBottom="true"
5240
android:layout_marginEnd="16dp"
5341
android:layout_marginBottom="90dp"
5442
android:onClick="toVtableActivity"
5543
android:src="@drawable/ic_box_blue"
44+
android:text="VTable"
45+
android:textColor="#FFF"
5646
android:visibility="gone"
57-
tools:ignore="ContentDescription,UsingOnClickInXml" />
47+
app:backgroundTint="@color/colorAccent"
48+
app:icon="@drawable/ic_box_green"
49+
app:iconTint="#FFF"
50+
tools:ignore="UsingOnClickInXml" />
5851

59-
<com.google.android.material.floatingactionbutton.FloatingActionButton
60-
android:layout_width="wrap_content"
52+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
53+
android:layout_width="130dp"
6154
android:layout_height="wrap_content"
6255
android:layout_alignParentEnd="true"
6356
android:layout_alignParentBottom="true"
6457
android:layout_marginEnd="16dp"
6558
android:layout_marginBottom="16dp"
6659
android:onClick="save"
67-
android:src="@drawable/ic_download"
60+
android:text="Save"
61+
android:textColor="#FFF"
6862
app:backgroundTint="@color/colorAccent"
69-
app:tint="#FFFFFF"
70-
tools:ignore="ContentDescription,UsingOnClickInXml" />
63+
app:icon="@drawable/ic_download"
64+
app:iconTint="#FFF"
65+
tools:ignore="UsingOnClickInXml" />
7166

7267
</RelativeLayout>
7368

‎app/src/main/res/layout/floating_menu.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
android:layout_width="30dp"
3131
android:layout_height="30dp"
3232
android:background="@drawable/bg_clickable"
33-
android:src="@drawable/ic_window_minimize"
33+
android:src="@drawable/ic_minimize"
3434
android:tint="@color/colorAccent" />
3535

3636
<androidx.appcompat.widget.AppCompatImageButton
@@ -53,33 +53,37 @@
5353
android:id="@+id/floatingmenuButtonPaste"
5454
android:layout_width="30dp"
5555
android:layout_height="30dp"
56+
android:alpha="0.38"
5657
android:background="@drawable/bg_clickable"
5758
android:src="@drawable/ic_paste"
58-
android:tint="@color/colorAccent" />
59+
android:tint="@color/textColorPrimary" />
5960

6061
<androidx.appcompat.widget.AppCompatImageButton
6162
android:id="@+id/floatingmenuButtonCopy"
6263
android:layout_width="30dp"
6364
android:layout_height="30dp"
65+
android:alpha="0.38"
6466
android:background="@drawable/bg_clickable"
6567
android:src="@drawable/ic_copy"
66-
android:tint="@color/colorAccent" />
68+
android:tint="@color/textColorPrimary" />
6769

6870
<androidx.appcompat.widget.AppCompatImageButton
6971
android:id="@+id/floatingmenuButtonClear"
7072
android:layout_width="30dp"
7173
android:layout_height="30dp"
74+
android:alpha="0.38"
7275
android:background="@drawable/bg_clickable"
7376
android:src="@drawable/ic_close"
74-
android:tint="@color/colorAccent" />
77+
android:tint="@color/textColorPrimary" />
7578

7679
<androidx.appcompat.widget.AppCompatImageButton
7780
android:id="@+id/floatingmenuButtonSearch"
7881
android:layout_width="30dp"
7982
android:layout_height="30dp"
83+
android:alpha="0.38"
8084
android:background="@drawable/bg_clickable"
8185
android:src="@drawable/ic_search"
82-
android:tint="@color/colorAccent" />
86+
android:tint="@color/textColorPrimary" />
8387

8488
</LinearLayout>
8589

‎app/src/main/res/layout/main_activity.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,19 @@
6767

6868
</RelativeLayout>
6969

70-
<com.google.android.material.floatingactionbutton.FloatingActionButton
71-
android:layout_width="wrap_content"
70+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
71+
android:layout_width="130dp"
7272
android:layout_height="wrap_content"
7373
android:layout_above="@id/mainactivityLinearLayout1"
7474
android:layout_alignParentEnd="true"
7575
android:layout_margin="16dp"
7676
android:onClick="chooseSdcard"
77-
android:src="@drawable/ic_folder"
77+
android:text="Open"
78+
android:textColor="#FFF"
7879
app:backgroundTint="@color/colorAccent"
79-
app:tint="#FFFFFF"
80-
tools:ignore="ContentDescription,UsingOnClickInXml" />
80+
app:icon="@drawable/ic_folder"
81+
app:iconTint="#FFF"
82+
tools:ignore="UsingOnClickInXml" />
8183

8284
</RelativeLayout>
8385

‎app/src/main/res/layout/symbol_activity.xml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,34 +176,39 @@
176176

177177
</ScrollView>
178178

179-
<com.google.android.material.floatingactionbutton.FloatingActionButton
179+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
180180
android:id="@+id/symbolactivityButtonFloat"
181-
android:layout_width="wrap_content"
181+
android:layout_width="140dp"
182182
android:layout_height="wrap_content"
183183
android:layout_alignParentEnd="true"
184184
android:layout_alignParentBottom="true"
185185
android:layout_marginEnd="16dp"
186186
android:layout_marginBottom="90dp"
187-
android:background="#D81B60"
188187
android:onClick="toVtableActivity"
189-
android:src="@drawable/ic_box_blue"
188+
android:text="VTable"
189+
android:textColor="#FFF"
190190
android:visibility="gone"
191191
app:backgroundTint="@color/colorAccent"
192+
app:icon="@drawable/ic_box_blue"
193+
app:iconTint="#FFF"
192194
app:tint="#FFFFFF"
193195
tools:ignore="ContentDescription,UsingOnClickInXml" />
194196

195-
<com.google.android.material.floatingactionbutton.FloatingActionButton
197+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
196198
android:id="@+id/symbolactivityButtonFloatClass"
197-
android:layout_width="wrap_content"
199+
android:layout_width="140dp"
198200
android:layout_height="wrap_content"
199201
android:layout_alignParentEnd="true"
200202
android:layout_alignParentBottom="true"
201203
android:layout_marginEnd="16dp"
202204
android:layout_marginBottom="16dp"
203205
android:onClick="toClassActivity"
204-
android:src="@drawable/objects"
206+
android:text="Classes"
207+
android:textColor="#FFF"
205208
android:visibility="gone"
206209
app:backgroundTint="@color/colorAccent"
210+
app:icon="@drawable/objects"
211+
app:iconTint="#FFF"
207212
app:tint="#FFFFFF"
208213
tools:ignore="ContentDescription,UsingOnClickInXml" />
209214

‎app/src/main/res/layout/symbols_activity.xml‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,26 @@
2727
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
2828
android:layout_width="130dp"
2929
android:layout_height="wrap_content"
30+
android:layout_above="@id/saveSymbols"
3031
android:layout_alignParentEnd="true"
31-
android:layout_alignParentBottom="true"
3232
android:layout_marginEnd="16dp"
33-
android:layout_marginBottom="90dp"
33+
android:layout_marginBottom="16dp"
34+
android:onClick="showFloatingMenu"
35+
android:text="Float"
36+
android:textColor="#FFF"
37+
app:backgroundTint="@color/colorAccent"
38+
app:icon="@drawable/ic_menu"
39+
app:iconTint="#FFF"
40+
tools:ignore="UsingOnClickInXml" />
41+
42+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
43+
android:id="@+id/saveSymbols"
44+
android:layout_width="130dp"
45+
android:layout_height="wrap_content"
46+
android:layout_above="@id/showSearch"
47+
android:layout_alignParentEnd="true"
48+
android:layout_marginEnd="16dp"
49+
android:layout_marginBottom="16dp"
3450
android:onClick="saveSymbols"
3551
android:text="Dump"
3652
android:textColor="#FFF"
@@ -40,6 +56,7 @@
4056
tools:ignore="UsingOnClickInXml" />
4157

4258
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
59+
android:id="@+id/showSearch"
4360
android:layout_width="130dp"
4461
android:layout_height="wrap_content"
4562
android:layout_alignParentEnd="true"

‎app/src/main/res/layout/vtable_activity.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,19 @@
2424
android:layout_below="@+id/view"
2525
android:fastScrollEnabled="true" />
2626

27-
<com.google.android.material.floatingactionbutton.FloatingActionButton
28-
android:layout_width="wrap_content"
27+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
28+
android:layout_width="130dp"
2929
android:layout_height="wrap_content"
3030
android:layout_alignParentEnd="true"
3131
android:layout_alignParentBottom="true"
3232
android:layout_marginEnd="16dp"
3333
android:layout_marginBottom="16dp"
3434
android:onClick="save"
35-
android:src="@drawable/ic_download"
35+
android:text="Save"
36+
android:textColor="#FFF"
3637
app:backgroundTint="@color/colorAccent"
38+
app:icon="@drawable/ic_download"
39+
app:iconTint="#FFF"
3740
app:tint="#FFFFFF"
3841
tools:ignore="ContentDescription,UsingOnClickInXml" />
3942

0 commit comments

Comments
 (0)