Skip to content

Commit 8b23957

Browse files
WSTxdaWSTxda
committed
Improve widgets layout and colors
1 parent 5da85bf commit 8b23957

17 files changed

Lines changed: 236 additions & 128 deletions

‎app/src/main/java/com/wstxda/switchai/widget/AssistantMaterialWidgetProvider.kt‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import android.appwidget.AppWidgetProvider
66
import android.content.Context
77
import android.content.Intent
88
import android.os.Bundle
9-
import android.view.View
109
import android.widget.RemoteViews
1110
import com.wstxda.switchai.R
1211
import com.wstxda.switchai.activity.AssistantSelectorActivity
@@ -65,6 +64,7 @@ class AssistantMaterialWidgetProvider : AppWidgetProvider() {
6564
val minHeight = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)
6665

6766
val layoutId = when {
67+
minHeight >= 100 -> R.layout.widget_assistant_material_tall
6868
minWidth < 150 -> R.layout.widget_assistant_material_small
6969
minWidth >= 300 -> R.layout.widget_assistant_material_wide
7070
else -> R.layout.widget_assistant_material_default
@@ -85,7 +85,7 @@ class AssistantMaterialWidgetProvider : AppWidgetProvider() {
8585

8686
setupClickIntents(context, appWidgetId, views)
8787

88-
setupAssistantList(context, appWidgetManager, appWidgetId, views, layoutId, minHeight)
88+
setupAssistantList(context, appWidgetManager, appWidgetId, views, layoutId)
8989

9090
appWidgetManager.updateAppWidget(appWidgetId, views)
9191
}
@@ -121,13 +121,9 @@ class AssistantMaterialWidgetProvider : AppWidgetProvider() {
121121
appWidgetId: Int,
122122
views: RemoteViews,
123123
layoutId: Int,
124-
minHeight: Int
125124
) {
126-
val isWideAndTall = layoutId == R.layout.widget_assistant_material_wide && minHeight > 100
127-
128-
if (isWideAndTall) {
129-
views.setViewVisibility(R.id.assistant_list, View.VISIBLE)
130125

126+
if (layoutId == R.layout.widget_assistant_material_tall) {
131127
val serviceIntent = Intent(context, WidgetAssistantListService::class.java)
132128
@Suppress("DEPRECATION") views.setRemoteAdapter(R.id.assistant_list, serviceIntent)
133129

@@ -145,8 +141,6 @@ class AssistantMaterialWidgetProvider : AppWidgetProvider() {
145141
@Suppress("DEPRECATION") appWidgetManager.notifyAppWidgetViewDataChanged(
146142
appWidgetId, R.id.assistant_list
147143
)
148-
} else if (layoutId == R.layout.widget_assistant_material_wide) {
149-
views.setViewVisibility(R.id.assistant_list, View.GONE)
150144
}
151145
}
152146
}

‎app/src/main/res/drawable/widget_background_material.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
android:color="?android:attr/colorControlHighlight">
33
<item>
44
<shape android:shape="rectangle">
5-
<solid android:color="@color/widget_background_color" />
5+
<solid android:color="@color/widget_surface" />
66
<corners android:radius="18dp" />
77
</shape>
88
</item>

app/src/main/res/drawable/widget_button_background_primary.xml renamed to app/src/main/res/drawable/widget_button_material_primary.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
android:color="?android:attr/colorControlHighlight">
33
<item>
44
<shape android:shape="rectangle">
5-
<solid android:color="@color/widget_background_color_primary" />
6-
<corners android:radius="28dp" />
5+
<solid android:color="@color/widget_primary" />
6+
<corners android:radius="24dp" />
77
</shape>
88
</item>
99
</ripple>

app/src/main/res/drawable/widget_button_background_secondary.xml renamed to app/src/main/res/drawable/widget_button_material_primary_container.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
android:color="?android:attr/colorControlHighlight">
33
<item>
44
<shape android:shape="rectangle">
5-
<solid android:color="@color/widget_background_color_secondary" />
6-
<corners android:radius="28dp" />
5+
<solid android:color="@color/widget_primary_container" />
6+
<corners android:radius="16dp" />
77
</shape>
88
</item>
99
</ripple>

‎app/src/main/res/drawable/widget_button_material_tertiary.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:color="?android:attr/colorControlHighlight">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<solid android:color="@color/widget_tertiary" />
6+
<corners android:radius="24dp" />
7+
</shape>
8+
</item>
9+
</ripple>

‎app/src/main/res/drawable/widget_button_material_tertiary_container.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:color="?android:attr/colorControlHighlight">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<solid android:color="@color/widget_tertiary_container" />
6+
<corners android:radius="16dp" />
7+
</shape>
8+
</item>
9+
</ripple>

‎app/src/main/res/drawable/widget_foreground_material.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
android:insetTop="2dp"
66
android:insetBottom="2dp">
77
<shape android:shape="rectangle">
8-
<solid android:color="@color/widget_foreground_color" />
9-
<corners android:radius="12dp" />
8+
<solid android:color="@color/widget_secondary_container" />
9+
<corners android:radius="16dp" />
1010
</shape>
1111
</inset>
1212
</item>

‎app/src/main/res/drawable/widget_material_preview.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
android:viewportWidth="192"
66
android:viewportHeight="121">
77
<path
8-
android:fillColor="#DCE2F9"
8+
android:fillColor="#F9F9FF"
99
android:pathData="M0 20c0-11.05 8.95-20 20-20h152c11.05 0 20 8.95 20 20v81c0 11.05-8.95 20-20 20h-152c-11.05 0-20-8.95-20-20z" />
1010
<path
11-
android:fillColor="#475D92"
11+
android:fillColor="#435E91"
1212
android:pathData="M15 49c0-18.78 15.22-34 34-34h34c18.78 0 34 15.22 34 34v24c0 18.78-15.22 34-34 34h-34c-18.78 0-34-15.22-34-34z" />
1313
<path
14-
android:fillColor="#725572"
14+
android:fillColor="#715574"
1515
android:pathData="M126 40.5c0-14.08 11.42-25.5 25.5-25.5h0c14.08 0 25.5 11.42 25.5 25.5v41c0 14.08-11.42 25.5-25.5 25.5h0c-14.08 0-25.5-11.42-25.5-25.5z" />
1616
<group>
1717
<clip-path android:pathData="M137 46H167V76H137z" />
1818
<group>
1919
<path
20-
android:fillColor="#FDD7FA"
20+
android:fillColor="#FBD7FC"
2121
android:pathData="M150.1 73.5c-0.59 0-1.14-0.13-1.65-0.38-0.5-0.25-0.94-0.6-1.3-1.06l-6.8-8.65 0.59-0.63c0.41-0.44 0.91-0.7 1.5-0.78 0.58-0.08 1.12 0.03 1.62 0.34l2.31 1.41V53.5c0-0.35 0.13-0.65 0.36-0.9 0.24-0.23 0.54-0.35 0.9-0.35 0.35 0 0.65 0.12 0.9 0.36s0.38 0.54 0.38 0.89v14.75l-3.03-1.88 3.25 4.16c0.12 0.15 0.27 0.26 0.43 0.34 0.17 0.09 0.35 0.13 0.53 0.13H157c0.69 0 1.28-0.24 1.77-0.73 0.48-0.5 0.73-1.08 0.73-1.77v-5c0-0.35-0.12-0.65-0.36-0.9-0.24-0.23-0.54-0.35-0.89-0.35h-6.84v-2.5h6.84c1.04 0 1.93 0.36 2.66 1.1 0.72 0.72 1.09 1.6 1.09 2.65v5c0 1.38-0.49 2.55-1.47 3.53s-2.16 1.47-3.53 1.47h-6.9Zm-7.88-16.88c-0.27-0.45-0.48-0.95-0.63-1.48-0.14-0.53-0.22-1.08-0.22-1.64 0-1.73 0.61-3.2 1.83-4.42 1.22-1.22 2.7-1.83 4.43-1.83 1.72 0 3.2 0.6 4.42 1.83 1.22 1.22 1.82 2.7 1.82 4.42 0 0.56-0.07 1.1-0.21 1.64-0.15 0.53-0.36 1.03-0.63 1.48l-2.16-1.24c0.17-0.3 0.3-0.6 0.38-0.9 0.08-0.3 0.13-0.63 0.13-0.98 0-1.04-0.37-1.93-1.1-2.66-0.73-0.73-1.61-1.09-2.66-1.09-1.04 0-1.92 0.36-2.65 1.1-0.73 0.72-1.1 1.6-1.1 2.65 0 0.35 0.05 0.68 0.13 0.98 0.08 0.3 0.2 0.6 0.38 0.9l-2.16 1.24Z"
2222
tools:ignore="VectorPath" />
2323
</group>
2424
</group>
2525
<path
26-
android:fillColor="#D9E2FF"
26+
android:fillColor="#D8E2FF"
2727
android:pathData="M67.94 76.38l1.03-2.36c1.8-4.17 5.1-7.52 9.25-9.38l3.16-1.4c1.72-0.76 1.72-3.26 0-4.01L78.4 57.9c-4.26-1.91-7.62-5.38-9.39-9.7l-1.05-2.54c-0.16-0.4-0.43-0.73-0.78-0.97-0.35-0.23-0.76-0.36-1.18-0.36-0.42 0-0.83 0.13-1.18 0.36-0.35 0.24-0.62 0.57-0.78 0.97L63 48.2c-1.77 4.32-5.13 7.79-9.39 9.7l-2.98 1.33c-1.72 0.75-1.72 3.25 0 4l3.16 1.41c4.15 1.86 7.45 5.21 9.25 9.38l1.03 2.36c0.16 0.38 0.43 0.7 0.77 0.94 0.35 0.23 0.76 0.35 1.17 0.35 0.41 0 0.82-0.12 1.17-0.35 0.34-0.23 0.61-0.56 0.77-0.94Z" />
2828
</vector>

‎app/src/main/res/layout/widget_assistant_material_default.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
android:layout_height="match_parent"
1616
android:layout_marginEnd="8dp"
1717
android:layout_weight="1"
18-
android:background="@drawable/widget_button_background_primary"
18+
android:background="@drawable/widget_button_material_primary"
1919
android:clickable="true"
2020
android:focusable="true"
2121
android:gravity="center">
@@ -27,7 +27,7 @@
2727
android:adjustViewBounds="true"
2828
android:contentDescription="@string/assistant_open"
2929
android:src="@drawable/ic_assistant"
30-
android:tint="@color/widget_icon_color_primary"
30+
android:tint="@color/widget_primary_container"
3131
tools:ignore="UseAppTint" />
3232
</LinearLayout>
3333

@@ -36,7 +36,7 @@
3636
android:layout_width="0dp"
3737
android:layout_height="match_parent"
3838
android:layout_weight="0.5"
39-
android:background="@drawable/widget_button_background_secondary"
39+
android:background="@drawable/widget_button_material_tertiary"
4040
android:clickable="true"
4141
android:focusable="true"
4242
android:gravity="center">
@@ -47,7 +47,7 @@
4747
android:adjustViewBounds="true"
4848
android:contentDescription="@string/assistant_select"
4949
android:src="@drawable/ic_select"
50-
android:tint="@color/widget_icon_color_secondary"
50+
android:tint="@color/widget_tertiary_container"
5151
tools:ignore="UseAppTint" />
5252
</LinearLayout>
5353
</LinearLayout>

‎app/src/main/res/layout/widget_assistant_material_small.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_width="match_parent"
1212
android:layout_height="0dp"
1313
android:layout_weight="1.4"
14-
android:background="@drawable/widget_background_material"
14+
android:background="@drawable/widget_button_material_primary_container"
1515
android:clickable="true"
1616
android:focusable="true"
1717
android:gravity="center">
@@ -23,17 +23,17 @@
2323
android:adjustViewBounds="true"
2424
android:contentDescription="@string/assistant_open"
2525
android:src="@drawable/ic_assistant"
26-
android:tint="@color/widget_background_color_primary"
26+
android:tint="@color/widget_on_primary_container"
2727
tools:ignore="UseAppTint" />
2828
</LinearLayout>
2929

3030
<LinearLayout
3131
android:id="@+id/button_assistant_select"
3232
android:layout_width="match_parent"
3333
android:layout_height="0dp"
34-
android:layout_marginTop="4dp"
34+
android:layout_marginTop="2dp"
3535
android:layout_weight="1"
36-
android:background="@drawable/widget_button_background_secondary"
36+
android:background="@drawable/widget_button_material_tertiary_container"
3737
android:clickable="true"
3838
android:focusable="true"
3939
android:gravity="center">
@@ -44,7 +44,7 @@
4444
android:adjustViewBounds="true"
4545
android:contentDescription="@string/assistant_open"
4646
android:src="@drawable/ic_select"
47-
android:tint="@color/widget_icon_color_secondary"
47+
android:tint="@color/widget_on_tertiary_container"
4848
tools:ignore="UseAppTint" />
4949
</LinearLayout>
5050
</LinearLayout>

0 commit comments

Comments
 (0)