lun_admin/android_multiviewwer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://dev.lunaticbum.kr/lun_admin/lun_launcher

Browse Source 
# Conflicts:
#	app/src/main/kotlin/rasel/lunar/launcher/home/adapters/WeatherAdapter.kt
..
This commit is contained in:
lunaticbum
2024-10-11 17:15:56 +09:00
parent 74902ecb73 45552eacf8
commit ed1371c84e
9 changed files with 231 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable/level_dress_img.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:maxLevel="6" android:drawable="@drawable/dress_padded_coat"/>
<item android:minLevel="6" android:maxLevel="12" android:drawable="@drawable/dress_heavy_outer"/>
<item android:minLevel="12" android:maxLevel="17" android:drawable="@drawable/dress_flimsy_outer"/>
<item android:minLevel="17" android:maxLevel="20" android:drawable="@drawable/dress_knitwear"/>
<item android:minLevel="20" android:maxLevel="23" android:drawable="@drawable/dress_long_sleeves"/>
<item android:minLevel="23" android:drawable="@drawable/dress_long_sleeves"/>
</level-list>
app/src/main/res/layout/item_rec_hourly_dress.xml
+56 -46
View File
@@ -1,48 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="80dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_height="wrap_content"
android:gravity="center"
android:id="@+id/weather_item">
<layout>
<data>
<variable name="hour" type="rasel.lunar.launcher.model.Hour" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="80dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_height="wrap_content"
android:gravity="center"
android:id="@+id/weather_item">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/amOrPm"
android:gravity="center"
android:fontFamily="sans-serif-medium"
android:textSize="14sp" />
<TextView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:id="@+id/hour"
android:background="@drawable/date_bg"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:textSize="14sp"
android:textAlignment="center"/>
<ImageView
android:id="@+id/imgDress"
android:layout_width="40dp"
android:layout_height="40dp"
android:contentDescription="온도별 옷차림"
app:tint="@android:color/white"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textDress"
android:fontFamily="sans-serif-light"
android:textSize="11sp"
android:gravity="center"
android:textAlignment="center"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/temperature"
android:fontFamily="sans-serif-medium"
android:textSize="14sp"
android:gravity="center"
android:textAlignment="center"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/amOrPm"
android:gravity="center"
android:text="@{hour.amOrPm}"
android:fontFamily="sans-serif-medium"
android:textSize="14sp" />
<TextView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:id="@+id/hour"
android:background="@drawable/date_bg"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:textSize="14sp"
android:text="@{hour.textHour}"
android:textAlignment="center"/>
<ImageView
android:id="@+id/imgDress"
android:layout_width="40dp"
android:src="@drawable/level_dress_img"
android:layout_height="40dp"
android:contentDescription="온도별 옷차림"
app:tint="@android:color/white"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textDress"
android:fontFamily="sans-serif-light"
android:textSize="11sp"
android:text="@{hour.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:fontFamily="sans-serif-medium"
android:textSize="14sp"
android:gravity="center"
android:textAlignment="center"/>
</LinearLayout>
</layout>
app/src/main/res/layout/recommended_hourly_dress.xml
+66 -43
View File
@@ -1,45 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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_width="match_parent"
android:layout_height="match_parent"
android:textAlignment="center">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="409dp"
android:layout_height="wrap_content"
android:gravity="left|center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView"
android:layout_width="25dp"
android:layout_height="25dp"
android:contentDescription="시계 아이콘"
app:srcCompat="@drawable/ico_time"
tools:ignore="ImageContrastCheck"
android:layout_marginLeft="20dp"
app:tint="@android:color/white" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:text="시간별 예보"
android:textAlignment="center"
android:textSize="14sp"
android:layout_marginLeft="10dp"/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
app:layout_constraintTop_toBottomOf="@id/linearLayout"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:id="@+id/weather_recycller"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable name="loc" type="rasel.lunar.launcher.model.Location"/>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="match_parent"
android:textAlignment="center">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:id="@+id/header">
<ImageView
android:id="@+id/imageView"
android:layout_width="25dp"
android:layout_height="25dp"
android:contentDescription="시계 아이콘"
app:srcCompat="@drawable/ico_time"
tools:ignore="ImageContrastCheck"
android:layout_marginLeft="20dp"
app:tint="@android:color/white"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textView2"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:text="시간별 예보"
android:gravity="left"
android:textSize="14sp"
android:layout_marginLeft="10dp"
app:layout_constraintStart_toEndOf="@id/imageView"
app:layout_constraintEnd_toStartOf="@id/textViewLocation"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintWidth_default="spread"/>
<TextView
android:id="@+id/textViewLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:text="@{loc.textLocation}"
android:textAlignment="center"
android:textSize="11sp"
android:layout_marginRight="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
app:layout_constraintTop_toBottomOf="@id/header"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:id="@+id/weather_recycller"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
app/src/main/res/values/strings.xml
+1
View File
@@ -166,4 +166,5 @@
</string>
<string name="wiki" translatable="false">Wiki</string>
</resources>