Merge branch 'main' of https://dev.lunaticbum.kr/lun_admin/lun_launcher
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout>
|
||||
<data>
|
||||
<variable name="hour" type="rasel.lunar.launcher.model.Hour" />
|
||||
<variable name="info" type="rasel.lunar.launcher.model.ShowingWeatherInfo"/>
|
||||
</data>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="80dp"
|
||||
@@ -16,7 +16,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/amOrPm"
|
||||
android:gravity="center"
|
||||
android:text="@{hour.amOrPm}"
|
||||
android:text="@{info.amOrPm}"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:textSize="14sp" />
|
||||
<TextView
|
||||
@@ -27,7 +27,7 @@
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:gravity="center"
|
||||
android:textSize="14sp"
|
||||
android:text="@{hour.textHour}"
|
||||
android:text="@{info.textHour}"
|
||||
android:textAlignment="center"/>
|
||||
<ImageView
|
||||
android:id="@+id/imgDress"
|
||||
@@ -42,14 +42,14 @@
|
||||
android:id="@+id/textDress"
|
||||
android:fontFamily="sans-serif-light"
|
||||
android:textSize="11sp"
|
||||
android:text="@{hour.dress}"
|
||||
android:text="@{info.dress}"
|
||||
android:gravity="center"
|
||||
android:textAlignment="center"/>
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/temperature"
|
||||
android:text="@{hour.temp}"
|
||||
android:text="@{info.temp}"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<data>
|
||||
<variable name="loc" type="rasel.lunar.launcher.model.Location"/>
|
||||
<variable name="info" type="rasel.lunar.launcher.model.ShowingWeatherInfo"/>
|
||||
</data>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
@@ -46,7 +46,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:text="@{loc.textLocation}"
|
||||
android:text="@{info.textLocation}"
|
||||
android:textAlignment="center"
|
||||
android:textSize="11sp"
|
||||
android:layout_marginRight="20dp"
|
||||
|
||||
Reference in New Issue
Block a user