Merge branch 'main' of https://dev.lunaticbum.kr/lun_admin/lun_launcher
# Conflicts: # app/src/main/kotlin/rasel/lunar/launcher/apps/AppDrawer.kt
This commit is contained in:
@@ -110,6 +110,7 @@
|
||||
style="@style/SearchIcons"
|
||||
android:id="@+id/search_store"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
<?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"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:clipToPadding="false"
|
||||
android:padding="@dimen/twelve"
|
||||
android:clickable="true"
|
||||
android:focusableInTouchMode="true">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/appName"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_width="wrap_content"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minWidth="@dimen/zero"
|
||||
android:gravity="center"
|
||||
android:padding="@dimen/eight"
|
||||
android:inputType="textNoSuggestions"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/phoneNumber"
|
||||
style="@style/Widget.Material3.Button.TextButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/appName" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/activityBrowser"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_activity"
|
||||
android:tooltipText="@string/activity_browser"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/detailedInfo"
|
||||
app:layout_constraintTop_toBottomOf="@+id/phoneNumber" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/detailedInfo"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
android:layout_marginEnd="@dimen/eight"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_info"
|
||||
android:tooltipText="@string/detailed_info"
|
||||
app:layout_constraintEnd_toStartOf="@id/activityBrowser"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/phoneNumber" />
|
||||
|
||||
<com.google.android.material.button.MaterialButtonToggleGroup
|
||||
android:id="@+id/favGroup"
|
||||
android:layout_width="@dimen/zero"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/detailedInfo"
|
||||
app:singleSelection="true" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/appInfo"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
android:layout_marginEnd="@dimen/eight"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_info2"
|
||||
android:tooltipText="@string/app_info"
|
||||
app:layout_constraintEnd_toStartOf="@id/appFreeform"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/favGroup" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/appFreeform"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
android:layout_marginEnd="@dimen/eight"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_pip"
|
||||
android:tooltipText="@string/freeform"
|
||||
app:layout_constraintEnd_toStartOf="@id/appStore"
|
||||
app:layout_constraintStart_toEndOf="@id/appInfo"
|
||||
app:layout_constraintTop_toBottomOf="@+id/favGroup" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/appStore"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
android:layout_marginEnd="@dimen/eight"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_store"
|
||||
android:tooltipText="@string/app_store"
|
||||
app:layout_constraintEnd_toStartOf="@id/appShare"
|
||||
app:layout_constraintStart_toEndOf="@id/appFreeform"
|
||||
app:layout_constraintTop_toBottomOf="@+id/favGroup" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/appShare"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
android:layout_marginEnd="@dimen/eight"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_share"
|
||||
android:tooltipText="@string/share"
|
||||
app:layout_constraintEnd_toStartOf="@id/appUninstall"
|
||||
app:layout_constraintStart_toEndOf="@id/appStore"
|
||||
app:layout_constraintTop_toBottomOf="@+id/favGroup" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/appUninstall"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/eight"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_delete"
|
||||
android:tooltipText="@string/uninstall"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/appShare"
|
||||
app:layout_constraintTop_toBottomOf="@+id/favGroup"
|
||||
app:tint="@android:color/holo_red_light" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -2,6 +2,7 @@
|
||||
<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">
|
||||
|
||||
@@ -29,11 +30,13 @@
|
||||
android:textIsSelectable="false"
|
||||
android:textSize="@dimen/clockText"
|
||||
android:textStyle="bold"
|
||||
android:textLocale="en_US"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/batteryProgress"
|
||||
app:layout_constraintEnd_toEndOf="@+id/batteryProgress"
|
||||
app:layout_constraintStart_toStartOf="@+id/batteryProgress"
|
||||
app:layout_constraintTop_toTopOf="@+id/batteryProgress"
|
||||
app:layout_constraintVertical_bias="0.450" />
|
||||
app:layout_constraintVertical_bias="0.450"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
|
||||
<TextClock
|
||||
android:id="@+id/date"
|
||||
@@ -41,12 +44,14 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
android:textLocale="en_US"
|
||||
android:textIsSelectable="false"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/batteryProgress"
|
||||
app:layout_constraintEnd_toEndOf="@+id/batteryProgress"
|
||||
app:layout_constraintStart_toStartOf="@+id/batteryProgress"
|
||||
app:layout_constraintTop_toBottomOf="@+id/time"
|
||||
app:layout_constraintVertical_bias="0.075" />
|
||||
app:layout_constraintVertical_bias="0.075"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/weather"
|
||||
@@ -61,18 +66,54 @@
|
||||
app:layout_constraintTop_toBottomOf="@+id/date"
|
||||
app:layout_constraintVertical_bias="0.100" />
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/summaryChoose"
|
||||
android:layout_width="0dp"
|
||||
android:gravity="center"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toBottomOf="@+id/batteryProgress"
|
||||
>
|
||||
<RadioButton
|
||||
android:id="@+id/missedCalls"
|
||||
android:button="@null"
|
||||
android:gravity="center"
|
||||
android:text="전화"
|
||||
android:checked="true"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
<RadioButton
|
||||
android:gravity="center"
|
||||
android:button="@null"
|
||||
android:text="투두"
|
||||
android:checked="false"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
<RadioButton
|
||||
android:gravity="center"
|
||||
android:button="@null"
|
||||
android:text="문자"
|
||||
android:checked="false"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
</RadioGroup>
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/notes"
|
||||
android:layout_width="@dimen/zero"
|
||||
android:layout_height="@dimen/zero"
|
||||
android:layout_height="200dp"
|
||||
android:overScrollMode="never"
|
||||
android:padding="@dimen/fortyEight"
|
||||
android:padding="20dp"
|
||||
android:scrollbars="none"
|
||||
app:layoutManager="LinearLayoutManager"
|
||||
app:layout_constraintBottom_toTopOf="@id/favAppsGroup"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/batteryProgress" />
|
||||
|
||||
app:layout_constraintTop_toBottomOf="@+id/summaryChoose" />
|
||||
|
||||
<androidx.appcompat.widget.LinearLayoutCompat
|
||||
android:id="@+id/favAppsGroup"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/itemText"
|
||||
android:layout_width="@dimen/zero"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
android:padding="@dimen/twelve"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
<?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"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:clipToPadding="false"
|
||||
android:padding="@dimen/twelve"
|
||||
android:clickable="true"
|
||||
android:focusableInTouchMode="true">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/keyworkd"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_width="wrap_content"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minWidth="@dimen/zero"
|
||||
android:textSize="24dp"
|
||||
android:gravity="center"
|
||||
android:padding="@dimen/eight"
|
||||
android:inputType="textNoSuggestions"
|
||||
/>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
style="@style/SearchMenus"
|
||||
android:id="@+id/quickSearch"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintTop_toBottomOf="@id/keyworkd">
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
style="@style/SearchMenuItem"
|
||||
android:src="@drawable/google"
|
||||
android:id="@+id/search_google"/>
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
style="@style/SearchMenuItem"
|
||||
android:src="@drawable/naver"
|
||||
android:id="@+id/search_naver"/>
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
style="@style/SearchMenuItem"
|
||||
app:civ_label="DDuckGo"
|
||||
android:src="@drawable/duckduckgo"
|
||||
android:id="@+id/search_duckduckgo"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/quickSearch2"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintTop_toBottomOf="@id/quickSearch"
|
||||
style="@style/SearchMenus">
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
android:src="@drawable/namuwiki"
|
||||
android:id="@+id/search_namuwiki"
|
||||
style="@style/SearchMenuItem"/>
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
style="@style/SearchMenuItem"
|
||||
android:src="@drawable/gmap"
|
||||
android:id="@+id/search_googleMap"/>
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
style="@style/SearchMenuItem"
|
||||
android:src="@drawable/navermap"
|
||||
android:id="@+id/search_nmap"/>
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/quickSearch3"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintTop_toBottomOf="@id/quickSearch2"
|
||||
style="@style/SearchMenus">
|
||||
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
style="@style/SearchMenuItem"
|
||||
android:src="@drawable/coupang"
|
||||
android:id="@+id/search_coupang"/>
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
android:src="@drawable/tmap"
|
||||
style="@style/SearchMenuItem"
|
||||
android:id="@+id/search_tmap"/>
|
||||
<rasel.lunar.launcher.view.CircleImageView
|
||||
android:src="@drawable/translate"
|
||||
style="@style/SearchMenuItem"
|
||||
android:id="@+id/search_translate"/>
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Reference in New Issue
Block a user