Skip to content

Convert data classes to Kotlin and add Room entities #12

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
powerje merged 2 commits into from
Mar 10, 2026
Merged

Convert data classes to Kotlin and add Room entities #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3017da
Convert data classes to Kotlin and add Room entities.
powerje Mar 10, 2026
ee5ef93
fixup! Convert data classes to Kotlin and add Room entities.
powerje Mar 10, 2026
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
62 changes: 0 additions & 62 deletions BTLib/src/main/java/com/offsetnull/bt/alias/AliasData.java
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions BTLib/src/main/java/com/offsetnull/bt/button/SlickButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ public void setFlipCommand(String t) {

public void setMoveMethod(int i) {
// Log.e("SB","MOVE STATE CHANGED TO:"+i);
data.MOVE_STATE = i;
data.moveState = i;
}

public int getMoveMethod() {
return data.MOVE_STATE;
return data.moveState;
}

public void setLabel(String t) {
Expand Down Expand Up @@ -322,15 +322,15 @@ public boolean onTouchEvent(MotionEvent e) {
}
if (e.getAction() == MotionEvent.ACTION_MOVE) {
if (moving) {
if (data.MOVE_STATE == SlickButtonData.MOVE_FREE) {
if (data.moveState == SlickButtonData.MOVE_FREE) {
if (!lockMove) {
data.setX(touchx);
data.setY(touchy);
}
updateRect();
// this.invalidate();
newstate = DISPLAY_STATE.MOVING;
} else if (data.MOVE_STATE == SlickButtonData.MOVE_NUDGE) {
} else if (data.moveState == SlickButtonData.MOVE_NUDGE) {
// compute nudge
int tmpx = touchx - start_x;
int tmpy = touchy - start_y;
Expand Down
Loading
Loading