Apply default attributes from XML theme

Apply default attributes from GliaTheme to the Entry Widget view in the XML layer. MOB-3601
salemove · Oct 31, 2024 · 8ae0b3e · 8ae0b3e
1 parent 0cb61af
commit 8ae0b3e
Show file tree

Hide file tree

Showing 33 changed files with 63 additions and 62 deletions.
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetFragment.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetFragment.kt
@@ -14,6 +14,7 @@ import com.glia.widgets.R
 import com.glia.widgets.databinding.EntryWidgetFragmentBinding
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.entrywidget.adapter.EntryWidgetAdapter
+import com.glia.widgets.helper.wrapWithMaterialThemeOverlay
 import com.glia.widgets.view.unifiedui.applyLayerTheme
 import com.glia.widgets.view.unifiedui.theme.entrywidget.EntryWidgetTheme
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -35,7 +36,8 @@ internal class EntryWidgetFragment : BottomSheetDialogFragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val binding = EntryWidgetFragmentBinding.inflate(inflater, container, false)
+        val layoutInflater = LayoutInflater.from(requireContext().wrapWithMaterialThemeOverlay())
+        val binding = EntryWidgetFragmentBinding.inflate(layoutInflater, container, false)
         val entryWidgetsTheme = Dependencies.gliaThemeManager.theme?.entryWidgetTheme
 
         setupView(requireContext(), binding, entryWidgetsTheme)

diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/EntryWidget.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/EntryWidget.kt
@@ -27,7 +27,7 @@ internal fun DefaultMediaTypeItemsTheme(pallet: ColorPallet?): MediaTypeItemsThe
     pallet?.run {
         MediaTypeItemsTheme(
             mediaTypeItem = DefaultMediaItemTypeTheme(this),
-            dividerColor = baseNormalColorTheme
+            dividerColor = baseShadeColorTheme
         )
     }
 

diff --git a/widgetssdk/src/main/res/drawable/bg_entry_widget_divider.xml b/widgetssdk/src/main/res/drawable/bg_entry_widget_divider.xml
@@ -7,7 +7,7 @@
         <shape
             android:shape="rectangle">
             <size android:height="@dimen/glia_px" />
-            <solid android:color="@color/glia_stroke_gray" />
+            <solid android:color="?attr/gliaBaseShadeColor" />
         </shape>
 
     </item>

diff --git a/widgetssdk/src/main/res/drawable/ic_drag_handle.xml b/widgetssdk/src/main/res/drawable/ic_drag_handle.xml
@@ -5,7 +5,5 @@
     android:viewportHeight="4">
   <path
       android:pathData="M2.5,0L30.5,0A2,2 0,0 1,32.5 2L32.5,2A2,2 0,0 1,30.5 4L2.5,4A2,2 0,0 1,0.5 2L0.5,2A2,2 0,0 1,2.5 0z"
-      android:strokeAlpha="0.4"
-      android:fillColor="#79747E"
-      android:fillAlpha="0.4"/>
+      android:fillColor="?attr/gliaBaseShadeColor" />
 </vector>
diff --git a/widgetssdk/src/main/res/layout/entry_widget_fragment.xml b/widgetssdk/src/main/res/layout/entry_widget_fragment.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/bg_bottom_sheet">
+    android:background="@drawable/bg_bottom_sheet"
+    android:backgroundTint="?attr/gliaBaseLightColor">
 
     <ImageView
         android:id="@+id/drag_handle"
@@ -16,7 +17,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/container"/>
+        app:layout_constraintBottom_toTopOf="@id/container" />
 
     <FrameLayout
         android:id="@+id/container"

diff --git a/...om.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsDefaultTheme.png b/...om.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsDefaultTheme.png
diff --git a/...lia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedTheme.png b/...lia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedTheme.png
diff --git a/...ywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithGlobalColors.png b/...ywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithGlobalColors.png
diff --git a/...idget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithoutEntryWidget.png b/...idget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithoutEntryWidget.png
diff --git a/...s/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyDefaultTheme.png b/...s/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyDefaultTheme.png
diff --git a/...m.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedTheme.png b/...m.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedTheme.png
diff --git a/...ntrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithGlobalColors.png b/...ntrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithGlobalColors.png
diff --git a/...rywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithoutEntryWidget.png b/...rywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithoutEntryWidget.png
diff --git a/...s/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultTheme.png b/...s/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultTheme.png
diff --git a/...m.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedTheme.png b/...m.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedTheme.png
diff --git a/...ntrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithGlobalColors.png b/...ntrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithGlobalColors.png
diff --git a/...rywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithoutEntryWidget.png b/...rywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithoutEntryWidget.png
diff --git a/...com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingDefaultTheme.png b/...com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingDefaultTheme.png
diff --git a/...glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedTheme.png b/...glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedTheme.png
diff --git a/...rywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithGlobalColors.png b/...rywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithGlobalColors.png
diff --git a/...widget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithoutEntryWidget.png b/...widget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithoutEntryWidget.png
diff --git a/...s.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsDefaultTheme.png b/...s.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsDefaultTheme.png
diff --git a/...trywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedTheme.png b/...trywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedTheme.png
diff --git a/...idgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png b/...idgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png
diff --git a/...getBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png b/...getBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png
diff --git a/...m.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsDefaultTheme.png b/...m.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsDefaultTheme.png
diff --git a/...ia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedTheme.png b/...ia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedTheme.png
diff --git a/...widget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithGlobalColors.png b/...widget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithGlobalColors.png
diff --git a/...dget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithoutEntryWidget.png b/...dget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithoutEntryWidget.png
diff --git a/...om.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingDefaultTheme.png b/...om.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingDefaultTheme.png
diff --git a/...lia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedTheme.png b/...lia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedTheme.png
diff --git a/...ywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithGlobalColors.png b/...ywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithGlobalColors.png
diff --git a/...idget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithoutEntryWidget.png b/...idget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithoutEntryWidget.png