Skip to content

Change naming convention for members #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 10, 2022
Merged

Change naming convention for members #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21901ce
Update ColorControllerFragment.java
gcattan Jan 10, 2022
90dc759
Update ColorControllerFragment.java
gcattan Jan 10, 2022
43fe8dc
Update ColorControllerFragment.java
gcattan Jan 10, 2022
47a6061
Update FloatingButton.java
gcattan Jan 10, 2022
793a027
Update ColorControllerFragment.java
gcattan Jan 10, 2022
1d0701a
typo
gcattan Jan 10, 2022
ce2950b
typo
gcattan Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions ColorPicker/src/main/java/com/example/colorpicker/ColorControllerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

public class ColorControllerFragment extends DialogFragment {
public FloatingButton floatingActionButton;
Integer color = -1111111;
ImageView rgbWheel;
Button confirmColorButton;
private int _color = -1111111;
private ImageView _rgbWheel;
private Button _confirmColorButton;

@Override
public void onCreate(Bundle savedInstanceState) {
Expand All @@ -43,35 +43,35 @@ public void onResume() {
}

void configureLayout(View v) {
rgbWheel = v.findViewById(R.id.rgbWheel);
confirmColorButton = v.findViewById(R.id.confirmColorBtn);
_rgbWheel = v.findViewById(R.id.rgbWheel);
_confirmColorButton = v.findViewById(R.id.confirmColorBtn);

rgbWheel.setDrawingCacheEnabled(true);
rgbWheel.buildDrawingCache(true);
rgbWheel.setOnTouchListener(new View.OnTouchListener() {
_rgbWheel.setDrawingCacheEnabled(true);
_rgbWheel.buildDrawingCache(true);
_rgbWheel.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
Bitmap bitmap;
if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) {
bitmap = rgbWheel.getDrawingCache();
bitmap = _rgbWheel.getDrawingCache();

int pixel = bitmap.getPixel((int)event.getX(), (int)event.getY());

int r = Color.red(pixel);
int g = Color.green(pixel);
int b = Color.blue(pixel);

color = Color.rgb(r, g ,b);
confirmColorButton.setBackgroundColor(color);
_color = Color.rgb(r, g ,b);
_confirmColorButton.setBackgroundColor(_color);
}
return true;
}
});

confirmColorButton.setOnClickListener(new View.OnClickListener() {
_confirmColorButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
floatingActionButton.setColor(color);
floatingActionButton.setColor(_color);
dismiss();
}
});
Expand Down
2 changes: 1 addition & 1 deletion ColorPicker/src/main/java/com/example/colorpicker/FloatingButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

public class FloatingButton extends FloatingActionButton {
// purple 500
public int _defaultColor = Color.rgb(156, 39, 176);
private int _defaultColor = Color.rgb(156, 39, 176);

public FloatingButton(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
Expand Down