Merge branch 'master' into gracia

This commit is contained in:
Gracia Hotmauli
2025-05-12 13:30:32 +07:00
committed by GitHub
80 changed files with 5020 additions and 170 deletions

View File

@ -41,4 +41,9 @@
<color name="gray_1">#E8ECF2</color>
<color name="soft_gray">#7D8FAB</color>
<color name="blue1">#489EC6</color>
<color name="bottom_navigation_icon_color_active">#489EC6</color>
<color name="bottom_navigation_icon_color_inactive">#8E8E8E</color>
<color name="bottom_navigation_text_color_active">#489EC6</color>
<color name="bottom_navigation_text_color_inactive">#8E8E8E</color>
</resources>

View File

@ -117,5 +117,25 @@
<item>Other reason</item>
</string-array>
<!-- Chat Activity -->
<string name="image_attached">Image attached</string>
<string name="write_message">Tulis pesan</string>
<string name="options">Options</string>
<string name="block_user">Block User</string>
<string name="report">Report</string>
<string name="clear_chat">Clear Chat</string>
<string name="block_user_selected">Block user selected</string>
<string name="report_selected">Report selected</string>
<string name="clear_chat_selected">Clear chat selected</string>
<string name="permission_denied">Permission denied</string>
<string name="take_photo">Take Photo</string>
<string name="choose_from_gallery">Choose from Gallery</string>
<string name="select_attachment">Select Attachment</string>
<string name="image_selected">Image selected</string>
<string name="connecting">Connecting...</string>
<string name="disconnected_reconnecting">Disconnected. Reconnecting...</string>
<string name="connection_error">Connection error: %1$s</string>
<string name="typing">User is typing...</string>
</resources>

View File

@ -25,4 +25,39 @@
<item name="cornerRadius">8dp</item>
<item name="backgroundTint">@color/blue_500</item>
</style>
<style name="SharpedBorderStyleOutline">
<item name="boxStrokeColor">@color/black_300</item>
<item name="boxStrokeWidth">1dp</item>
<item name="boxCornerRadiusTopStart">4dp</item>
<item name="boxCornerRadiusTopEnd">4dp</item>
<item name="boxCornerRadiusBottomStart">4dp</item>
<item name="boxCornerRadiusBottomEnd">4dp</item>
<item name="android:textColorHint">@color/black_300</item>
</style>
<style name="CustomBottomNavActiveIndicator" parent="@style/Widget.Material3.BottomNavigationView.ActiveIndicator">
<item name="android:width">40dp</item>
<item name="android:height">4dp</item>
<item name="shapeAppearanceOverlay">@style/CustomActiveIndicatorShape</item>
</style>
<style name="CustomActiveIndicatorShape">
<item name="cornerSize">2dp</item>
</style>
<style name="BottomNavigationTextStyle" parent="TextAppearance.MaterialComponents.Caption">
<item name="android:textSize">14sp</item>
<item name="fontFamily">@font/dmsans_semibold</item>
<item name="android:paddingTop">8dp</item>
<item name="android:layout_marginTop">4dp</item>
</style>
<style name="BottomAppBar">
<item name="strokeColor">@color/light_gray</item>
<item name="strokeWidth">2dp</item>
<item name="color">@color/white</item>
<item name="cornerRadius">8dp</item>
<item name="backgroundTint">@color/white</item>
</style>
</resources>

View File

@ -1,16 +1,45 @@
<resources>
<!-- Base application theme. -->
<style name="Theme.Ecommerce_serang" parent="Theme.Material3.Light.NoActionBar">
<!-- Customize your light theme here. -->
<!-- Primary Color Customization -->
<item name="colorPrimary">@color/blue_500</item>
<item name="colorPrimaryDark">@color/white</item>
<item name="colorAccent">@color/black</item>
<item name="colorPrimaryVariant">@color/blue_600</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary Color Customization -->
<item name="colorSecondary">@color/blue_500</item>
<item name="colorSecondaryVariant">@color/blue_600</item>
<item name="colorOnSecondary">@color/white</item>
<!-- Surface and Background Colors -->
<item name="colorSurface">@color/white</item>
<item name="colorOnSurface">@color/black</item>
<item name="colorPrimaryContainer">@color/blue_500</item>
<item name="colorOnPrimaryContainer">@color/white</item>
<item name="android:colorBackground">@color/white</item>
<!-- <item name="colorBackground">@color/white</item>-->
<!-- Container Colors -->
<item name="colorPrimaryContainer">@color/blue_50</item>
<item name="colorOnPrimaryContainer">@color/blue_500</item>
<!-- Status Bar and Navigation Bar -->
<!-- Remove Content Insets -->
<item name="android:contentInsetStart">0dp</item>
<item name="android:contentInsetLeft">0dp</item>
<!-- Bottom Navigation Specific -->
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
<item name="bottomAppBarStyle">@style/BottomAppBar</item>
<!-- Remove Purple Accent Color -->
<item name="colorAccent">@color/blue_500</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<!-- <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>-->
</style>
<!-- Text Styles -->