forked from openhab/openhab-android
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes openhab#3421 Signed-off-by: mueller-ma <[email protected]>
- Loading branch information
1 parent
124b203
commit 8e08afd
Showing
11 changed files
with
94 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,31 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<FrameLayout | ||
<LinearLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:orientation="vertical" | ||
style="@style/WidgetListItemContainer"> | ||
|
||
<org.openhab.habdroid.ui.widget.WidgetImageView | ||
android:id="@+id/widget_content" | ||
<include layout="@layout/widgetlist_icontext_for_heavy_data" /> | ||
|
||
<FrameLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
app:imageScalingType="scaleToFitWithViewAdjustment" | ||
app:emptyHeightToWidthRatio="50%" | ||
app:progressIndicator="@drawable/ic_image_loading_themed" | ||
app:addRandomnessToUrl="true" /> | ||
android:descendantFocusability="blocksDescendants"> | ||
|
||
<org.openhab.habdroid.ui.widget.WidgetImageView | ||
android:id="@+id/widget_content" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
app:imageScalingType="scaleToFitWithViewAdjustment" | ||
app:emptyHeightToWidthRatio="50%" | ||
app:progressIndicator="@drawable/ic_image_loading_themed" | ||
app:addRandomnessToUrl="true" /> | ||
|
||
<include layout="@layout/widgetlist_data_saver" /> | ||
</FrameLayout> | ||
|
||
|
||
<include layout="@layout/widgetlist_data_saver" /> | ||
|
||
</FrameLayout> | ||
</LinearLayout> |
29 changes: 29 additions & 0 deletions
29
mobile/src/main/res/layout/widgetlist_icontext_for_heavy_data.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
xmlns:tools="http://schemas.android.com/tools" | ||
android:layout_height="wrap_content" | ||
android:layout_width="match_parent"> | ||
|
||
<org.openhab.habdroid.ui.widget.WidgetImageView | ||
android:id="@+id/widgeticon" | ||
android:layout_width="@dimen/widgetlist_icon_size" | ||
android:layout_height="@dimen/widgetlist_icon_size" | ||
android:layout_gravity="center_vertical" | ||
app:imageScalingType="scaleToFit" | ||
tools:src="@drawable/ic_openhab_appicon_24dp" /> | ||
|
||
<TextView | ||
android:id="@+id/widgetlabel" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_gravity="center_vertical" | ||
android:layout_marginStart="16dp" | ||
android:layout_weight="1" | ||
android:ellipsize="end" | ||
android:maxLines="1" | ||
android:textDirection="locale" | ||
android:textAppearance="?attr/textAppearanceBodyLarge" | ||
tools:text="Widget title" /> | ||
|
||
</LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,26 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<FrameLayout | ||
<LinearLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:tools="http://schemas.android.com/tools" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:orientation="vertical" | ||
style="@style/WidgetListItemContainer" | ||
tools:ignore="WebViewLayout"> | ||
|
||
<WebView | ||
android:id="@+id/widget_content" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" /> | ||
<include layout="@layout/widgetlist_icontext_for_heavy_data" /> | ||
|
||
<androidx.core.widget.ContentLoadingProgressBar | ||
android:id="@+id/progress_bar" | ||
style="?android:attr/progressBarStyleHorizontal" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" /> | ||
|
||
<WebView | ||
android:id="@+id/widget_content" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" /> | ||
|
||
<include layout="@layout/widgetlist_data_saver" /> | ||
|
||
</FrameLayout> | ||
</LinearLayout> |