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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenLicht
openhab-android
Commits
c1059adb
Commit
c1059adb
authored
5 years ago
by
Julian Catoni
Browse files
Options
Downloads
Patches
Plain Diff
Some code cleanup, added strings
parent
4676c6ab
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
+8
-9
8 additions, 9 deletions
.../src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
mobile/src/main/res/values/strings.xml
+4
-0
4 additions, 0 deletions
mobile/src/main/res/values/strings.xml
with
12 additions
and
9 deletions
mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
+
8
−
9
View file @
c1059adb
...
@@ -1005,22 +1005,21 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1005,22 +1005,21 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
}
}
private
final
static
Handler
mSnackbarHandler
=
new
Handler
();
private
final
static
Handler
mSnackbarHandler
=
new
Handler
();
private
final
static
int
DELAY_SNACKBAR
=
20
00
;
private
final
static
int
DELAY_SNACKBAR
=
15
00
;
private
static
void
showSnackbar
(
View
v
,
int
delay
,
String
identifier
)
{
private
static
void
showSnackbar
(
View
v
,
int
delay
,
Item
item
)
{
mSnackbarHandler
.
removeCallbacksAndMessages
(
null
);
mSnackbarHandler
.
removeCallbacksAndMessages
(
null
);
final
View
currentView
=
v
.
getRootView
();
final
View
currentView
=
v
.
getRootView
();
Snackbar
snackbar
=
Snackbar
.
make
(
currentView
,
"Manuelle Änderung als neuen Standardwert setzen?"
,
Snackbar
.
LENGTH_LONG
);
Snackbar
snackbar
=
Snackbar
.
make
(
currentView
,
currentView
.
getContext
().
getString
(
R
.
string
.
snackbar_set_default
,
item
.
label
()),
Snackbar
.
LENGTH_LONG
);
snackbar
.
setAction
(
"Setze als\nStandard"
,
v1
->
{
snackbar
.
setAction
(
currentView
.
getContext
().
getString
(
R
.
string
.
snackbar_btn_set_default
),
v1
->
{
Toast
.
makeText
(
currentView
.
getContext
(),
"Änderung wurde als neuer Standardwert gesetzt!"
,
Toast
.
LENGTH_SHORT
).
show
();
try
{
try
{
GetDataService
service
=
RetrofitClientInstance
.
getRetrofitInstance
(
currentView
.
getContext
()).
create
(
GetDataService
.
class
);
GetDataService
service
=
RetrofitClientInstance
.
getRetrofitInstance
(
currentView
.
getContext
()).
create
(
GetDataService
.
class
);
Call
<
ResponseBody
>
call
=
service
.
setNewDefaultValue
(
i
dentifier
);
Call
<
ResponseBody
>
call
=
service
.
setNewDefaultValue
(
i
tem
.
name
()
);
call
.
enqueue
(
new
Callback
<
ResponseBody
>()
{
call
.
enqueue
(
new
Callback
<
ResponseBody
>()
{
@Override
@Override
public
void
onResponse
(
Call
<
ResponseBody
>
call
,
Response
<
ResponseBody
>
response
)
{
public
void
onResponse
(
Call
<
ResponseBody
>
call
,
Response
<
ResponseBody
>
response
)
{
Toast
.
makeText
(
currentView
.
getContext
(),
"S
uccess
"
,
Toast
.
LENGTH_LONG
).
show
();
Toast
.
makeText
(
currentView
.
getContext
(),
currentView
.
getContext
().
getString
(
R
.
string
.
toast_set_default_s
uccess
)
,
Toast
.
LENGTH_LONG
).
show
();
}
}
@Override
@Override
...
@@ -1074,7 +1073,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1074,7 +1073,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
(
itemView
,
DELAY_SNACKBAR
,
mBoundItem
.
name
()
);
WidgetAdapter
.
showSnackbar
(
itemView
,
DELAY_SNACKBAR
,
mBoundItem
);
}
else
{
}
else
{
showColorPickerDialog
();
showColorPickerDialog
();
}
}
...
@@ -1124,7 +1123,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
...
@@ -1124,7 +1123,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
.
setView
(
contentView
)
.
setView
(
contentView
)
.
setOnDismissListener
(
dialog
->
{
.
setOnDismissListener
(
dialog
->
{
if
(
mColorChanged
)
{
if
(
mColorChanged
)
{
WidgetAdapter
.
showSnackbar
(
itemView
,
0
,
mBoundItem
.
name
()
);
WidgetAdapter
.
showSnackbar
(
itemView
,
0
,
mBoundItem
);
mColorChanged
=
false
;
mColorChanged
=
false
;
}
}
})
})
...
...
This diff is collapsed.
Click to expand it.
mobile/src/main/res/values/strings.xml
+
4
−
0
View file @
c1059adb
...
@@ -232,4 +232,8 @@
...
@@ -232,4 +232,8 @@
<string
name=
"app_intro_skip_button"
>
SKIP
</string>
<string
name=
"app_intro_skip_button"
>
SKIP
</string>
<!-- Intro "DONE" button -->
<!-- Intro "DONE" button -->
<string
name=
"app_intro_done_button"
>
DONE
</string>
<string
name=
"app_intro_done_button"
>
DONE
</string>
<string
name=
"snackbar_set_default"
>
Set manual change as new default value for %1$s?
</string>
<string
name=
"toast_set_default_success"
>
Manual change was set as new default value!
</string>
<string
name=
"snackbar_btn_set_default"
>
Set as\ndefault
</string>
</resources>
</resources>
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