Skip to content

Commit 5705a72

Browse files
committed
refactored
1 parent b997a78 commit 5705a72

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

app/src/main/java/net/innoflash/iosviews/Toolbars.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected void onCreate(Bundle savedInstanceState) {
1919

2020
toolbar = findViewById(R.id.toolbar);
2121

22-
toolbar.setOptionsClicked(new Toolbar.OptionsClicked() {
22+
toolbar.setOnOptionsClicked(new Toolbar.OptionsClicked() {
2323
@Override
2424
public void optionsClicked(View view) {
2525
Toast.makeText(getApplicationContext(), "You clicked the options on the toolbar", Toast.LENGTH_SHORT).show();

iosview/src/main/java/net/innoflash/iosview/Toolbar.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.content.res.TypedArray;
6-
import android.graphics.Color;
76
import android.util.AttributeSet;
87
import android.view.LayoutInflater;
98
import android.view.View;
@@ -19,7 +18,7 @@ public class Toolbar extends RelativeLayout implements View.OnClickListener {
1918
private TextView toolbarTextView;
2019
private ImageButton optionsImageButton;
2120
private Activity activity;
22-
private OptionsClicked optionsClicked;
21+
private OptionsClicked onOptionsClicked;
2322
private String pageTitle;
2423
private int icon;
2524
private int toolbarBackgroundColor;
@@ -68,8 +67,8 @@ public void onClick(View v) {
6867
activity = (Activity) getContext();
6968
activity.finish();
7069
} else {
71-
if (optionsClicked != null)
72-
optionsClicked.optionsClicked(this);
70+
if (onOptionsClicked != null)
71+
onOptionsClicked.optionsClicked(this);
7372
}
7473
}
7574

@@ -89,8 +88,8 @@ public Activity getActivity() {
8988
return activity;
9089
}
9190

92-
public OptionsClicked getOptionsClicked() {
93-
return optionsClicked;
91+
public OptionsClicked getOnOptionsClicked() {
92+
return onOptionsClicked;
9493
}
9594

9695
public String getPageTitle() {
@@ -109,8 +108,8 @@ public boolean isNoBackButton() {
109108
return noBackButton;
110109
}
111110

112-
public void setOptionsClicked(OptionsClicked optionsClicked) {
113-
this.optionsClicked = optionsClicked;
111+
public void setOnOptionsClicked(OptionsClicked onOptionsClicked) {
112+
this.onOptionsClicked = onOptionsClicked;
114113
}
115114

116115
public void setPageTitle(String pageTitle) {

0 commit comments

Comments
 (0)