This commit is contained in:
lunaticbum
2024-10-18 16:16:41 +09:00
parent edca12a137
commit 94000c4b67
134 changed files with 1663 additions and 2373 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_launcher" />
app:srcCompat="@drawable/ic_launcher" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/appName"
+14 -14
View File
@@ -70,23 +70,23 @@
app:layout_constraintTop_toBottomOf="@id/title_webs"
android:layout_width="match_parent"
android:layout_height="50dp">
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/google"
android:id="@+id/search_google"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/naver"
android:id="@+id/search_naver"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/duckduckgo"
android:id="@+id/search_duckduckgo"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/namuwiki"
android:id="@+id/search_namuwiki"
style="@style/SearchIcons"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/youtube"
android:id="@+id/search_youtube"
style="@style/SearchIcons"/>
@@ -97,23 +97,23 @@
app:layout_constraintTop_toBottomOf="@id/quickSearch"
android:layout_width="match_parent"
android:layout_height="50dp">
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/gmap"
android:id="@+id/search_googleMap"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/navermap"
android:id="@+id/search_nmap"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/tmap"
style="@style/SearchIcons"
android:id="@+id/search_tmap"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/translate"
style="@style/SearchIcons"
android:id="@+id/search_translate"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/playstore"
style="@style/SearchIcons"
android:id="@+id/search_store"/>
@@ -156,19 +156,19 @@
app:layout_constraintTop_toBottomOf="@id/title_run"
android:layout_width="match_parent"
android:layout_height="50dp">
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/send"
android:id="@+id/run_send"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/telegram"
android:id="@+id/run_telegram"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
android:src="@drawable/katalk"
android:id="@+id/run_katalk"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchIcons"
app:civ_label="카카오 택시"
android:src="@drawable/kakaot"
+11 -1
View File
@@ -45,13 +45,23 @@
android:padding="@dimen/eight"
android:inputType="textNoSuggestions"
/>
<EditText
android:inputType="none"
android:id="@+id/alterName"
android:textSize="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/eight"
app:layout_constraintTop_toBottomOf="@id/totalTouch"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView
android:id="@+id/appPackage"
android:textSize="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/eight"
app:layout_constraintTop_toBottomOf="@id/totalTouch"
app:layout_constraintTop_toBottomOf="@id/alterName"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
+3 -3
View File
@@ -63,7 +63,7 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
app:civ_circle_background_color="#77FFFFFF"
app:civ_border_width="8dp"
app:civ_border_color="#77FFFFFF"
@@ -74,7 +74,7 @@
android:layout_margin="@dimen/eight"
android:src="@drawable/contact"
/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
app:civ_circle_background_color="#77FFFFFF"
app:civ_border_width="8dp"
app:civ_border_color="#77FFFFFF"
@@ -85,7 +85,7 @@
android:layout_margin="@dimen/eight"
android:src="@drawable/message"
/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
app:civ_circle_background_color="#77FFFFFF"
app:civ_border_width="8dp"
app:civ_border_color="#77FFFFFF"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable name="info" type="rasel.lunar.launcher.model.ShowingWeatherInfo"/>
<variable name="info" type="bums.lunatic.launcher.model.ShowingWeatherInfo"/>
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="80dp"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable name="info" type="rasel.lunar.launcher.model.ShowingWeatherInfo"/>
<variable name="info" type="bums.lunatic.launcher.model.ShowingWeatherInfo"/>
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="80dp"
+6 -5
View File
@@ -21,7 +21,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<rasel.lunar.launcher.view.DateTimeView
<bums.lunatic.launcher.view.DateTimeView
android:layout_margin="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
android:layout_margin="5dp"
android:layout_height="40dp"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
app:layout_constraintLeft_toLeftOf="@id/time"
app:layout_constraintTop_toTopOf="@id/time"
app:layout_constraintBottom_toBottomOf="@id/time"
@@ -86,6 +86,7 @@
android:background="@drawable/base_bg"
android:layout_margin="10dp"
android:padding="5dp"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -157,7 +158,7 @@
android:id="@+id/missedCalls"
android:gravity="center"
android:textColor="@color/tabs"
android:text="전화"
android:text="통화 목록"
android:background="@null"
android:checked="true"
android:layout_weight="1"
@@ -168,7 +169,7 @@
android:id="@+id/otherCheck"
android:gravity="center"
android:background="@null"
android:text="투두"
android:text="글타래"
android:textColor="@color/tabs"
android:checked="false"
android:layout_weight="1"
@@ -179,7 +180,7 @@
android:id="@+id/recentSms"
android:gravity="center"
android:background="@null"
android:text="문자"
android:text="문자 내역"
android:textColor="@color/tabs"
android:checked="false"
android:layout_weight="1"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable name="info" type="rasel.lunar.launcher.model.ShowingWeatherInfo"/>
<variable name="info" type="bums.lunatic.launcher.model.ShowingWeatherInfo"/>
</data>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/weather_dress_recycller"
+2 -2
View File
@@ -4,7 +4,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<rasel.lunar.launcher.view.TableRadioGroup
<bums.lunatic.launcher.view.TableRadioGroup
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
</rasel.lunar.launcher.view.TableRadioGroup>
</bums.lunatic.launcher.view.TableRadioGroup>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/colorInputLayout"
android:layout_width="@dimen/oneNinetySix"
+9 -9
View File
@@ -29,15 +29,15 @@
android:id="@+id/quickSearch"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/keyworkd">
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchMenuItem"
android:src="@drawable/google"
android:id="@+id/search_google"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchMenuItem"
android:src="@drawable/naver"
android:id="@+id/search_naver"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchMenuItem"
app:civ_label="DDuckGo"
android:src="@drawable/duckduckgo"
@@ -50,15 +50,15 @@
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/quickSearch"
style="@style/SearchMenus">
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/namuwiki"
android:id="@+id/search_namuwiki"
style="@style/SearchMenuItem"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchMenuItem"
android:src="@drawable/gmap"
android:id="@+id/search_googleMap"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchMenuItem"
android:src="@drawable/navermap"
android:id="@+id/search_nmap"/>
@@ -72,15 +72,15 @@
app:layout_constraintTop_toBottomOf="@id/quickSearch2"
style="@style/SearchMenus">
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
style="@style/SearchMenuItem"
android:src="@drawable/coupang"
android:id="@+id/search_coupang"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/tmap"
style="@style/SearchMenuItem"
android:id="@+id/search_tmap"/>
<rasel.lunar.launcher.view.CircleImageView
<bums.lunatic.launcher.view.CircleImageView
android:src="@drawable/translate"
style="@style/SearchMenuItem"
android:id="@+id/search_translate"/>
+195 -140
View File
@@ -1,163 +1,218 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout
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:padding="@dimen/twelve">
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/searchWithKeyboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_with_keyboard"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/twelve">
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/keyboardAutoGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/searchWithKeyboard"
app:selectionRequired="true"
app:singleSelection="true"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/searchWithKeyboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_with_keyboard"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/quickLaunch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/quick_launch"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keyboardAutoGroup" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/keyboardAutoGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/searchWithKeyboard"
app:selectionRequired="true"
app:singleSelection="true"/>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/quickLaunchGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/quickLaunch"
app:selectionRequired="true"
app:singleSelection="true"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/quickLaunch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/quick_launch"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keyboardAutoGroup" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/quickLaunchGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/quickLaunch"
app:selectionRequired="true"
app:singleSelection="true"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/appsCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/apps_count"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/quickLaunchGroup" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/appsCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/apps_count"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/quickLaunchGroup" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/appsCountGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appsCount"
app:selectionRequired="true"
app:singleSelection="true"/>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/appsCountGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appsCount"
app:selectionRequired="true"
app:singleSelection="true"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/columnsCountTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:textSize="@dimen/normalText"
android:text="@string/grid_columns_count"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appsCountGroup" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/columnsCountTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:textSize="@dimen/normalText"
android:text="@string/grid_columns_count"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appsCountGroup" />
<com.google.android.material.slider.Slider
android:id="@+id/columnsCount"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="40"
android:stepSize="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/columnsCountTitle" />
<com.google.android.material.slider.Slider
android:id="@+id/columnsCount"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="40"
android:stepSize="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/columnsCountTitle" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/shortTimeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/shortTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/columnsCount" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/shortTimeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/shortTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/columnsCount" />
<com.google.android.material.slider.Slider
android:id="@+id/shortTime"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="60"
android:stepSize="5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/shortTimeTitle" />
<com.google.android.material.slider.Slider
android:id="@+id/shortTime"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="60"
android:stepSize="5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/shortTimeTitle" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/middleTimeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/middleTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/shortTime" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/middleTimeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/middleTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/shortTime" />
<com.google.android.material.slider.Slider
android:id="@+id/middleTime"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="120"
android:stepSize="5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/middleTimeTitle" />
<com.google.android.material.slider.Slider
android:id="@+id/middleTime"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="120"
android:stepSize="5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/middleTimeTitle" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/longTimeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/longTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/middleTime" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/longTimeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/longTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/middleTime" />
<com.google.android.material.slider.Slider
android:id="@+id/longTime"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="180"
android:stepSize="5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/longTimeTitle" />
<com.google.android.material.slider.Slider
android:id="@+id/longTime"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="180"
android:stepSize="5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/longTimeTitle" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/locationTimeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/longTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/longTime" />
<com.google.android.material.slider.Slider
android:id="@+id/locationTime"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="5"
android:valueTo="180"
android:stepSize="5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/locationTimeTitle" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/locationDistanceTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/longTimeTitle"
android:textSize="@dimen/normalText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/locationTime" />
<com.google.android.material.slider.Slider
android:id="@+id/locationDistance"
android:layout_width="@dimen/zero"
android:layout_height="wrap_content"
android:valueFrom="50"
android:valueTo="2000"
android:stepSize="50"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/locationDistanceTitle" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</FrameLayout>
@@ -93,54 +93,76 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/doubleTapLock"
android:layout_width="wrap_content"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/feedInputLayout5"
android:layout_width="@dimen/threeTwentyFour"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/double_tap_action"
android:textSize="@dimen/normalText"
android:hint="@string/carName"
app:endIconMode="clear_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/feedInputLayout4" />
app:layout_constraintTop_toBottomOf="@+id/feedInputLayout4">
<com.google.android.material.chip.ChipGroup
android:id="@+id/lockGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/doubleTapLock"
app:selectionRequired="true"
app:singleSelection="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/inputFeedUrl5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:imeOptions="actionDone"
android:singleLine="true" />
<com.google.android.material.chip.Chip
android:id="@+id/selectLockNegative"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/negative" />
<com.google.android.material.chip.Chip
android:id="@+id/selectLockAccessibility"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accessibility" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.chip.Chip
android:id="@+id/selectLockAdmin"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/device_admin" />
<com.google.android.material.chip.Chip
android:id="@+id/selectLockRoot"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/root" />
</com.google.android.material.chip.ChipGroup>
<!-- <com.google.android.material.textview.MaterialTextView-->
<!-- android:id="@+id/doubleTapLock"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/twelve"-->
<!-- android:text="@string/double_tap_action"-->
<!-- android:textSize="@dimen/normalText"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/feedInputLayout4" />-->
<!-- <com.google.android.material.chip.ChipGroup-->
<!-- android:id="@+id/lockGroup"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/doubleTapLock"-->
<!-- app:selectionRequired="true"-->
<!-- app:singleSelection="true">-->
<!-- <com.google.android.material.chip.Chip-->
<!-- android:id="@+id/selectLockNegative"-->
<!-- style="@style/Widget.Material3.Chip.Filter.Elevated"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/negative" />-->
<!-- <com.google.android.material.chip.Chip-->
<!-- android:id="@+id/selectLockAccessibility"-->
<!-- style="@style/Widget.Material3.Chip.Filter.Elevated"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/accessibility" />-->
<!-- <com.google.android.material.chip.Chip-->
<!-- android:id="@+id/selectLockAdmin"-->
<!-- style="@style/Widget.Material3.Chip.Filter.Elevated"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/device_admin" />-->
<!-- <com.google.android.material.chip.Chip-->
<!-- android:id="@+id/selectLockRoot"-->
<!-- style="@style/Widget.Material3.Chip.Filter.Elevated"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/root" />-->
<!-- </com.google.android.material.chip.ChipGroup>-->
</androidx.constraintlayout.widget.ConstraintLayout>
+25 -4
View File
@@ -9,7 +9,7 @@
android:id="@+id/phoneTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/todo_count"
android:text="통화목록"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -146,7 +146,7 @@
android:id="@+id/smsTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/todo_count"
android:text="문자 내역"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -167,7 +167,7 @@
android:id="@+id/notificationTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/todo_count"
android:text="알림 내역"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -175,7 +175,7 @@
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/notificationInfos"
android:text="사용 여부"
android:text="표시 여부"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
@@ -184,4 +184,25 @@
app:selectionRequired="true"
app:singleSelection="true"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/nowPlayingTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="재생중인 곡"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/notificationInfos" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/nowPlaying"
android:text="사용 여부"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nowPlayingTitle"
app:selectionRequired="true"
app:singleSelection="true"/>
</androidx.constraintlayout.widget.ConstraintLayout>
+20 -65
View File
@@ -5,24 +5,6 @@
android:layout_height="wrap_content"
android:padding="@dimen/twelve">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/cityInputLayout"
android:layout_width="@dimen/oneNinetySix"
android:layout_height="wrap_content"
android:hint="@string/city_name"
app:endIconMode="clear_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/inputCity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:imeOptions="actionDone"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/owmInputLayout"
@@ -33,7 +15,7 @@
app:endIconMode="clear_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cityInputLayout">
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/inputOwm"
@@ -44,75 +26,48 @@
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/tempUnit"
<com.google.android.material.textview.MaterialTextView
android:id="@+id/dressTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/twelve"
android:text="@string/temp_unit"
android:text="옷차림 보기"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/owmInputLayout" />
app:layout_constraintTop_toBottomOf="@id/owmInputLayout" />
<com.google.android.material.chip.ChipGroup
android:id="@+id/tempGroup"
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/dress"
android:text="사용 여부"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tempUnit"
app:layout_constraintTop_toBottomOf="@+id/dressTitle"
app:selectionRequired="true"
app:singleSelection="true">
app:singleSelection="true"/>
<com.google.android.material.chip.Chip
android:id="@+id/selectCelsius"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/celsius" />
<com.google.android.material.chip.Chip
android:id="@+id/selectFahrenheit"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fahrenheit" />
</com.google.android.material.chip.ChipGroup>
<TextView
android:id="@+id/showCity"
<com.google.android.material.textview.MaterialTextView
android:id="@+id/weatherTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/eight"
android:text="@string/show_city"
android:text="재생중인 곡"
android:textSize="@dimen/normalText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tempGroup" />
app:layout_constraintTop_toBottomOf="@id/dress" />
<com.google.android.material.chip.ChipGroup
android:id="@+id/cityGroup"
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/weather"
android:text="사용 여부"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/showCity"
app:layout_constraintTop_toBottomOf="@+id/weatherTitle"
app:selectionRequired="true"
app:singleSelection="true">
app:singleSelection="true"/>
<com.google.android.material.chip.Chip
android:id="@+id/showCityPositive"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/positive" />
<com.google.android.material.chip.Chip
android:id="@+id/showCityNegative"
style="@style/Widget.Material3.Chip.Filter.Elevated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/negative" />
</com.google.android.material.chip.ChipGroup>
</androidx.constraintlayout.widget.ConstraintLayout>