Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
openhab-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenLicht
openhab-android
Commits
4a70e845
Commit
4a70e845
authored
5 years ago
by
Julian Catoni
Browse files
Options
Downloads
Patches
Plain Diff
Fixed snackbar after manual changes
parent
b868fe20
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
+20
-17
20 additions, 17 deletions
.../src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
with
20 additions
and
17 deletions
mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
+
20
−
17
View file @
4a70e845
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
package
org.openhab.habdroid.ui
;
package
org.openhab.habdroid.ui
;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.content.res.ColorStateList
;
import
android.content.res.ColorStateList
;
...
@@ -71,15 +70,11 @@ import org.openhab.habdroid.util.Util;
...
@@ -71,15 +70,11 @@ import org.openhab.habdroid.util.Util;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Locale
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Random
;
import
java.util.Random
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.ScheduledExecutorService
;
import
java.util.concurrent.TimeUnit
;
/**
/**
* This class provides openHAB widgets adapter for list view.
* This class provides openHAB widgets adapter for list view.
...
@@ -1000,19 +995,18 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1000,19 +995,18 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
}
}
}
}
private
final
static
Handler
h
andler
=
new
Handler
();
private
final
static
Handler
mSnackbarH
andler
=
new
Handler
();
private
final
static
int
DELAY_SNACKBAR
=
3
000
;
private
final
static
int
DELAY_SNACKBAR
=
2
000
;
private
static
void
showSnackbar
(
View
v
,
int
delay
,
AlertDialog
dialog
)
{
private
static
void
showSnackbar
(
View
v
,
int
delay
)
{
h
andler
.
removeCallbacksAndMessages
(
null
);
mSnackbarH
andler
.
removeCallbacksAndMessages
(
null
);
final
View
currentView
=
v
.
getRootView
().
findFocus
();
final
View
currentView
=
v
.
getRootView
().
findFocus
();
h
andler
.
postDelayed
(()
->
{
mSnackbarH
andler
.
postDelayed
(()
->
{
Snackbar
snackbar
=
Snackbar
.
make
(
currentView
,
"
Soll die m
anuelle Änderung als neue
r
Standardwert
genutzt werd
en?"
,
Snackbar
.
LENGTH_LONG
);
Snackbar
snackbar
=
Snackbar
.
make
(
currentView
,
"
M
anuelle Änderung als neue
n
Standardwert
setz
en?"
,
Snackbar
.
LENGTH_LONG
);
snackbar
.
setAction
(
"Setze als
Standard"
,
v1
->
{
snackbar
.
setAction
(
"Setze als
\n
Standard"
,
v1
->
{
Toast
.
makeText
(
currentView
.
getContext
(),
"Änderung wurde als neuer Standardwert gesetzt!"
,
Toast
.
LENGTH_SHORT
).
show
();
Toast
.
makeText
(
currentView
.
getContext
(),
"Änderung wurde als neuer Standardwert gesetzt!"
,
Toast
.
LENGTH_SHORT
).
show
();
});
});
snackbar
.
show
();
snackbar
.
show
();
if
(
dialog
!=
null
)
dialog
.
dismiss
();
},
delay
);
},
delay
);
}
}
...
@@ -1024,7 +1018,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1024,7 +1018,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
private
Item
mBoundItem
;
private
Item
mBoundItem
;
private
final
LayoutInflater
mInflater
;
private
final
LayoutInflater
mInflater
;
private
final
Handler
mHandler
=
new
Handler
(
this
);
private
final
Handler
mHandler
=
new
Handler
(
this
);
private
AlertDialog
mAlertDialog
;
private
boolean
mColorChanged
;
ColorViewHolder
(
LayoutInflater
inflater
,
ViewGroup
parent
,
ColorViewHolder
(
LayoutInflater
inflater
,
ViewGroup
parent
,
Connection
conn
,
ColorMapper
colorMapper
)
{
Connection
conn
,
ColorMapper
colorMapper
)
{
...
@@ -1053,7 +1047,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1053,7 +1047,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
if
(
v
.
getTag
()
instanceof
String
)
{
if
(
v
.
getTag
()
instanceof
String
)
{
final
String
cmd
=
(
String
)
v
.
getTag
();
final
String
cmd
=
(
String
)
v
.
getTag
();
Util
.
sendItemCommand
(
mConnection
.
getAsyncHttpClient
(),
mBoundItem
,
cmd
);
Util
.
sendItemCommand
(
mConnection
.
getAsyncHttpClient
(),
mBoundItem
,
cmd
);
WidgetAdapter
.
showSnackbar
(
v
,
DELAY_SNACKBAR
,
mAlertDialog
);
WidgetAdapter
.
showSnackbar
(
v
,
DELAY_SNACKBAR
);
}
else
{
}
else
{
showColorPickerDialog
();
showColorPickerDialog
();
}
}
...
@@ -1069,7 +1063,6 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1069,7 +1063,6 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
final
String
newColorValue
=
String
.
format
(
Locale
.
US
,
"%f,%f,%f"
,
final
String
newColorValue
=
String
.
format
(
Locale
.
US
,
"%f,%f,%f"
,
hsv
[
0
],
hsv
[
1
]
*
100
,
hsv
[
2
]
*
100
);
hsv
[
0
],
hsv
[
1
]
*
100
,
hsv
[
2
]
*
100
);
Util
.
sendItemCommand
(
mConnection
.
getAsyncHttpClient
(),
mBoundItem
,
newColorValue
);
Util
.
sendItemCommand
(
mConnection
.
getAsyncHttpClient
(),
mBoundItem
,
newColorValue
);
WidgetAdapter
.
showSnackbar
(
itemView
,
DELAY_SNACKBAR
,
mAlertDialog
);
return
true
;
return
true
;
}
}
...
@@ -1090,13 +1083,23 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1090,13 +1083,23 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
colorPicker
.
setOnColorChangedListener
(
this
);
colorPicker
.
setOnColorChangedListener
(
this
);
colorPicker
.
setShowOldCenterColor
(
false
);
colorPicker
.
setShowOldCenterColor
(
false
);
colorPicker
.
setOnColorSelectedListener
(
color
->
mColorChanged
=
true
);
saturationBar
.
setOnSaturationChangedListener
(
saturation
->
mColorChanged
=
true
);
valueBar
.
setOnValueChangedListener
(
value
->
mColorChanged
=
true
);
float
[]
initialColor
=
mBoundItem
.
stateAsHsv
();
float
[]
initialColor
=
mBoundItem
.
stateAsHsv
();
if
(
initialColor
!=
null
)
{
if
(
initialColor
!=
null
)
{
colorPicker
.
setColor
(
Color
.
HSVToColor
(
initialColor
));
colorPicker
.
setColor
(
Color
.
HSVToColor
(
initialColor
));
}
}
mAlertDialog
=
new
AlertDialog
.
Builder
(
contentView
.
getContext
())
new
AlertDialog
.
Builder
(
contentView
.
getContext
())
.
setView
(
contentView
)
.
setView
(
contentView
)
.
setOnDismissListener
(
dialog
->
{
if
(
mColorChanged
)
{
WidgetAdapter
.
showSnackbar
(
itemView
,
0
);
mColorChanged
=
false
;
}
})
.
setNegativeButton
(
R
.
string
.
close
,
null
).
show
();
.
setNegativeButton
(
R
.
string
.
close
,
null
).
show
();
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment