Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

openhab-android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

68517f0e

Commit 68517f0e authored 5 years ago by Julian Catoni

Downloads
- Plain Diff

Merge branch 'feature/url-preference' into feature/redesign-recognitions

parents 4a70e845 b1a6b908

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

mobile/build.gradle 0 additions, 3 deletions

mobile/build.gradle
mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java 2 additions, 0 deletions

...ain/java/org/openhab/habdroid/ui/PreferencesActivity.java
mobile/src/main/java/org/openhab/habdroid/ui/RecognitionsActivity.java 1 addition, 1 deletion

...in/java/org/openhab/habdroid/ui/RecognitionsActivity.java
mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java 2 additions, 0 deletions

.../src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
mobile/src/main/java/org/openhab/habdroid/util/Constants.java 1 addition, 0 deletions

...le/src/main/java/org/openhab/habdroid/util/Constants.java
mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java 9 additions, 4 deletions

...ava/org/openhab/habdroid/util/RetrofitClientInstance.java
mobile/src/main/res/values/strings.xml 2 additions, 0 deletions

mobile/src/main/res/values/strings.xml
mobile/src/main/res/xml/preferences.xml 7 additions, 0 deletions

mobile/src/main/res/xml/preferences.xml

with 24 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment