Skip to content

Commit

Permalink
Fix OOTT with the latest Domoticz ui changes
Browse files Browse the repository at this point in the history
Fix OOTT with the latest Domoticz ui changes
  • Loading branch information
Mark Heinis committed Oct 19, 2018
1 parent c549f2a commit 805cca3
Show file tree
Hide file tree
Showing 227 changed files with 76 additions and 70 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/oott/res/drawable/palette.png
Binary file added app/src/oott/res/drawable/wheel.png
Binary file added app/src/oott/res/drawable/wheel_dark.png
Binary file added app/src/oott/res/drawable/wwpalette.png
Binary file added app/src/oott/res/drawable/wwslider.png
20 changes: 10 additions & 10 deletions app/src/oott/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
~ specific language governing permissions and limitations
~ under the License.
-->

<resources>
<color name="primary">#2196F3</color>
<color name="primary_dark">#2196F3</color>

<!-- Material design colors -->
<color name="primary">#263238</color>
<color name="primary_dark">#22272B</color>

<color name="secondary">#1E88E5</color>
<color name="secondary_dark">#1D7DD1</color>
<color name="secondary">#1B324D</color>
<color name="secondary_dark">#142A3B</color>

<color name="accent">#22272B</color>
<color name="background_grey">#EDEDED</color>
<color name="accent">@color/button_dark_status</color>

<color name="background_dark">#303030</color>
<color name="button_dark">#50BDBDBD</color>
<color name="background_dark">#2A292F</color>
<color name="card_background_dark">#2A292F</color>
<color name="button_dark">#284B6B</color>
<color name="button_dark_status">#284B6B</color>

<color name="welcome1_background">@color/black</color>
<color name="welcome2_background">@color/default_background_color_light</color>
Expand Down
6 changes: 6 additions & 0 deletions app/src/oott/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
<string name="button_state_off">Off</string>
<string name="button_state_closed">Closed</string>
<string name="button_state_open">Open</string>
<string name="button_state_lock">Lock</string>
<string name="button_state_unlock">Unlock</string>
<string name="button_status_log">Log</string>
<string name="button_status_day">Day</string>
<string name="button_status_week">Week</string>
Expand All @@ -47,6 +49,8 @@
<string name="button_color">Color</string>
<string name="button_arm">Arm</string>
<string name="button_disarm">Disarm</string>
<string name="button_state_full_light">Full light</string>
<string name="button_state_night">Night light</string>

<string name="last_update">Last seen</string>
<string name="signal_level">Signal level</string>
Expand Down Expand Up @@ -98,6 +102,8 @@

<string name="switch_on">Turning switch on</string>
<string name="switch_off">Turning switch off</string>
<string name="switch_night">Turning switch to night light</string>
<string name="switch_full">Turning switch to full light</string>

<string name="blind_up">Turning blind up</string>
<string name="blind_down">Turning blind down</string>
Expand Down
107 changes: 51 additions & 56 deletions app/src/oott/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,55 +18,70 @@
~ specific language governing permissions and limitations
~ under the License.
-->

<resources>
<!-- Base application theme. -->
<style name="AppThemeMain" parent="MaterialDrawerTheme.Light.DarkToolbar">
<style name="AppThemeIntro" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<!-- Base application theme. -->
<style name="AppThemeMain" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="android:dialogTheme">@style/MyDialogTheme</item>
<item name="android:alertDialogTheme">@style/MyDialogTheme</item>
<item name="dialogTheme">@style/MyDialogTheme</item>
<item name="alertDialogTheme">@style/MyDialogTheme</item>
<item name="colorAccent">@color/primary</item>

<!-- MaterialDrawer specific values -->
<item name="material_drawer_background">@color/material_drawer_background</item>
<item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
<item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
<item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
<item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
<item name="material_drawer_divider">@color/material_drawer_divider</item>
<item name="material_drawer_selected">@color/material_drawer_selected</item>
<item name="material_drawer_selected_text">@color/material_drawer_selected_text</item>
<item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
</style>

<style name="AppThemeDarkMain" parent="MaterialDrawerTheme">
<style name="AppThemeDarkMain" parent="Theme.MaterialComponents.NoActionBar">
<item name="colorPrimary">@color/secondary</item>
<item name="colorPrimaryDark">@color/secondary_dark</item>
<item name="android:dialogTheme">@style/MyDarkDialogTheme</item>
<item name="android:alertDialogTheme">@style/MyDarkDialogTheme</item>
<item name="dialogTheme">@style/MyDarkDialogTheme</item>
<item name="alertDialogTheme">@style/MyDarkDialogTheme</item>
<item name="colorAccent">@color/primary</item>

<!-- MaterialDrawer specific values -->
<item name="material_drawer_background">@color/card_background_dark</item>
<item name="material_drawer_primary_text">@color/material_drawer_dark_primary_text</item>
<item name="material_drawer_primary_icon">@color/material_drawer_dark_primary_icon</item>
<item name="material_drawer_secondary_text">@color/material_drawer_dark_secondary_text</item>
<item name="material_drawer_hint_text">@color/material_drawer_dark_hint_text</item>
<item name="material_drawer_divider">@color/material_drawer_dark_divider</item>
<item name="material_drawer_selected">@color/button_dark</item>
<item name="material_drawer_selected_text">@color/material_drawer_dark_selected_text</item>
<item name="material_drawer_header_selection_text">@color/material_drawer_dark_header_selection_text</item>
</style>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="android:dialogTheme">@style/MyDialogTheme</item>
<item name="android:alertDialogTheme">@style/MyDialogTheme</item>
<item name="dialogTheme">@style/MyDialogTheme</item>
<item name="alertDialogTheme">@style/MyDialogTheme</item>
<item name="colorAccent">@color/primary</item>
</style>

<style name="AppThemeDark" parent="Theme.AppCompat">
<style name="AppThemeDark" parent="Theme.MaterialComponents.Bridge">
<item name="colorPrimary">@color/secondary</item>
<item name="colorPrimaryDark">@color/secondary_dark</item>
<item name="android:dialogTheme">@style/MyDarkDialogTheme</item>
<item name="android:alertDialogTheme">@style/MyDarkDialogTheme</item>
<item name="dialogTheme">@style/MyDarkDialogTheme</item>
<item name="alertDialogTheme">@style/MyDarkDialogTheme</item>
<item name="colorAccent">@color/primary</item>
</style>

<!-- Styles Light -->
<style name="background_listview">
<item name="android:paddingLeft">@dimen/row_space</item>
<item name="android:paddingRight">@dimen/row_space</item>
<item name="android:background">@color/material_grey_300_</item>
<item name="android:background">@color/background_grey</item>
</style>

<style name="background_recyclerview">
<item name="android:background">@color/material_grey_300_</item>
<item name="android:background">@color/background_grey</item>
</style>

<style name="listview_row">
Expand All @@ -93,41 +108,41 @@
<style name="nav_name" parent="@style/TextAppearance.AppCompat.Body1">
<item name="android:paddingTop">10dp</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:textSize">18sp</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">normal</item>
<item name="android:layout_marginBottom">5dp</item>
</style>

<style name="row_name" parent="@style/TextAppearance.AppCompat.Title">
<item name="android:paddingTop">10dp</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:textSize">18sp</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">normal</item>
<item name="android:layout_marginBottom">5dp</item>
</style>

<style name="row_dash_name" parent="@style/TextAppearance.AppCompat.Title">
<style name="row_dash_name" parent="@style/TextAppearance.AppCompat.Subhead">
<item name="android:paddingTop">10dp</item>
<item name="android:textSize">18sp</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">normal</item>
<item name="android:layout_marginBottom">5dp</item>
</style>

<style name="row_name_micro" parent="@style/TextAppearance.AppCompat.Title">
<style name="row_name_micro" parent="@style/TextAppearance.AppCompat.Subhead">
<item name="android:paddingLeft">10dp</item>
<item name="android:textSize">11sp</item>
<item name="android:textSize">10sp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="row_name_small" parent="@style/TextAppearance.AppCompat.Title">
<style name="row_name_small" parent="@style/TextAppearance.AppCompat.Subhead">
<item name="android:paddingLeft">10dp</item>
<item name="android:textSize">18sp</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="row_body1" parent="@style/TextAppearance.AppCompat.Body1">
<item name="android:paddingLeft">10dp</item>
<item name="android:textSize">14sp</item>
<item name="android:textSize">12sp</item>
<item name="android:textStyle">normal</item>
<item name="android:layout_marginBottom">2dp</item>
</style>
Expand All @@ -146,9 +161,9 @@
<item name="android:layout_marginBottom">2dp</item>
</style>

<style name="row_dash_body2" parent="@style/TextAppearance.AppCompat.Body2">
<style name="row_dash_body2" parent="@style/TextAppearance.AppCompat.Body1">
<item name="android:paddingBottom">10dp</item>
<item name="android:textSize">14sp</item>
<item name="android:textSize">8sp</item>
<item name="android:textStyle">italic</item>
<item name="android:layout_marginBottom">2dp</item>
</style>
Expand All @@ -158,7 +173,6 @@
<item name="android:scrollbarStyle">outsideOverlay</item>
</style>


<!-- Debugging -->
<style name="debug_layout">
<item name="android:layout_width">match_parent</item>
Expand All @@ -180,31 +194,12 @@
<item name="android:scrollbars">vertical</item>
</style>

<style name="MyDialogTheme" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowCloseOnTouchOutside">false</item>
</style>

<style name="MyDarkDialogTheme" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowCloseOnTouchOutside">false</item>
<item name="colorAccent">#FFFFFF</item>
<item name="android:textColorPrimary">#FFFFFF</item>
<item name="android:textColor">#FFFFFF</item>
<item name="android:background">@color/primary_dark</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
</style>

<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />

<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>

<style name="AppTheme.PopupOverlay" parent="Theme.MaterialComponents.Light.Bridge"/>
</resources>
7 changes: 6 additions & 1 deletion app/src/oott/res/values/translationArrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<resources>
<string-array name="domoticz_language_entryValues" translatable="false">
<item>EN</item>
<item>BS</item>
<item>CA</item>
<item>CS</item>
<item>DA</item>
Expand All @@ -40,11 +41,14 @@
<item>RU</item>
<item>SK</item>
<item>SV</item>
<item>TR</item>
<item>UK</item>
<item>zh_CN</item>
</string-array>

<string-array name="domoticz_language_entries">
<item>English</item>
<item>Bosnian</item>
<item>Catalan</item>
<item>Czech</item>
<item>Danish</item>
Expand All @@ -62,7 +66,8 @@
<item>Russian</item>
<item>Slovak</item>
<item>Swedish</item>
<item>Turkish</item>
<item>Ukrainian</item>
<item>Chinese Simplified</item>
</string-array>

</resources>
4 changes: 2 additions & 2 deletions app/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri Oct 19 16:03:22 CEST 2018
VERSION_BUILD=4805
#Fri Oct 19 16:27:16 CEST 2018
VERSION_BUILD=4812
VERSION_PATCH=491
VERSION_CODE=315
2 changes: 1 addition & 1 deletion domoticzapi/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri Oct 19 16:03:22 CEST 2018
#Fri Oct 19 16:27:17 CEST 2018
VERSION_BUILD=3675
VERSION_PATCH=143
VERSION_CODE=143

0 comments on commit 805cca3

Please sign in to comment.