Skip to content

Commit

Permalink
Merge pull request #6 from 3sidedcube/fix/ui-updates
Browse files Browse the repository at this point in the history 
Fix/UI updates
  • Loading branch information
@DSMISHA
DSMISHA authored Sep 26, 2023
2 parents d840c05 + 8e30b14 commit 524e7b0
Show file tree
Hide file tree
Showing 22 changed files with 667 additions and 355 deletions.
19 changes: 19 additions & 0 deletions app/src/main/res/drawable/background_button_primary.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/blue_500"
android:exitFadeDuration="@android:integer/config_shortAnimTime">
<item android:id="@android:id/mask">
<shape
android:shape="rectangle">
<solid android:color="@color/blue_500" />
<corners android:radius="8dp" />
</shape>
</item>

<item>
<shape android:shape="rectangle">
<solid android:color="@color/blue_200" />
<corners android:radius="8dp" />
</shape>
</item>
</ripple>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/background_button_primary_disabled.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/grey_300" /> <!-- Set the background color -->
<corners android:radius="8dp" /> <!-- Adjust the radius as needed -->
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/background_button_primary_selector.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/background_button_primary" android:state_enabled="true" />
<item android:drawable="@drawable/background_button_primary_disabled" android:state_enabled="false" />
</selector>
22 changes: 22 additions & 0 deletions app/src/main/res/drawable/background_button_secondary.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/grey_500"
android:exitFadeDuration="@android:integer/config_shortAnimTime">
<item android:id="@android:id/mask">
<shape
android:shape="rectangle">
<solid android:color="@color/grey_500" />
<corners android:radius="8dp" />
</shape>
</item>

<item>
<shape android:shape="rectangle">
<solid android:color="@color/white" />
<stroke
android:color="@color/grey_400"
android:width="2dp" />
<corners android:radius="8dp" />
</shape>
</item>
</ripple>
8 changes: 8 additions & 0 deletions app/src/main/res/drawable/background_button_secondary_disabled.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" /> <!-- Set the background color -->
<corners android:radius="8dp" /> <!-- Adjust the radius as needed -->
<stroke
android:color="@color/grey_400"
android:width="2dp" />
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/background_button_secondary_selector.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/background_button_secondary" android:state_enabled="true" />
<item android:drawable="@drawable/background_button_secondary_disabled" android:state_enabled="false" />
</selector>
2 changes: 2 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@

<color name="error_main">#EF5567</color>
<color name="error_secondary">#F1CBCF</color>

<color name="white">#FFFFFF</color>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,6 @@
<dimen name="radius_primary_12">12dp</dimen>
<dimen name="radius_secondary_14">14dp</dimen>
<dimen name="radius_circle_30">30dp</dimen>

<dimen name="scrollend_spacing_40">40dp</dimen>
</resources>
97 changes: 97 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Heading">
<item name="android:textColor">@color/grey_500</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Heading.Bold" parent="Heading">
<item name="android:textStyle">bold</item>
</style>

<style name="Heading.1">
<item name="android:textSize">36sp</item>
<item name="lineHeight">40dp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Heading.1.Bold" parent="Heading.1">
<item name="android:textStyle">bold</item>
</style>

<style name="Heading.2">
<item name="android:textSize">28sp</item>
<item name="lineHeight">32dp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Heading.2.Bold" parent="Heading.2">
<item name="android:textStyle">bold</item>
</style>

<style name="Heading.3">
<item name="android:textSize">20sp</item>
<item name="lineHeight">28dp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Heading.3.Bold" parent="Heading.3">
<item name="android:textStyle">bold</item>
</style>

<style name="Heading.4">
<item name="android:textSize">24sp</item>
<item name="android:lineHeight">32dp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Heading.4.Bold" parent="Heading.4">
<item name="android:textStyle">bold</item>
</style>


<style name="Subtitle">
<item name="android:textColor">@color/grey_500</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Subtitle.Bold" parent="Subtitle">
<item name="android:textStyle">bold</item>
</style>

<style name="Subtitle.1">
<item name="android:textSize">20sp</item>
<item name="android:letterSpacing">0.0125</item>
<item name="lineHeight">24dp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Subtitle.1.Bold" parent="Subtitle.1">
<item name="android:textStyle">bold</item>
</style>

<style name="Subtitle.2">
<item name="android:textSize">16sp</item>
<item name="android:letterSpacing">0.0125</item>
<item name="lineHeight">20dp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Subtitle.2.Bold" parent="Subtitle.2">
<item name="android:textStyle">bold</item>
</style>

<style name="Body">
<item name="android:textColor">@color/grey_500</item>
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0.02</item>
<item name="lineHeight">20dp</item>
<item name="android:textStyle">normal</item>
</style>

<style name="Body.Bold" parent="Body">
<item name="android:textStyle">bold</item>
</style>


<!-- Button styles -->
<style name="BaseButton">
<item name="android:textSize">16sp</item>
<item name="android:letterSpacing">0.02</item>
<item name="android:lineSpacingMultiplier">1</item>
<item name="android:lineSpacingExtra">8sp</item>
<item name="android:fontWeight">700</item>
<item name="android:textColor">@color/blue_500</item>
<item name="android:textAllCaps">false</item>
<item name="android:gravity">center</item>
<item name="android:paddingVertical">16dp</item>
<item name="android:paddingHorizontal">12dp</item>
<item name="android:translationZ">2dp</item>
</style>

<style name="Button.Primary" parent="BaseButton">
<item name="minHeight">@dimen/spacing_28</item>
<item name="elevation">@dimen/elevation_light</item>
<item name="android:stateListAnimator">@null</item>
<item name="android:background">@drawable/background_button_primary_selector</item>
<item name="background">@drawable/background_button_primary_selector</item>
</style>

<style name="Button.Secondary" parent="BaseButton">
<item name="minHeight">@dimen/spacing_28</item>
<item name="elevation">@dimen/elevation_light</item>
<item name="android:stateListAnimator">@null</item>
<item name="android:background">@drawable/background_button_secondary_selector</item>
<item name="background">@drawable/background_button_secondary_selector</item>
</style>

<!-- <style name="Button.FAB" parent="BaseButton">-->
<!-- <item name="minHeight">@dimen/spacing_28</item>-->
<!-- <item name="elevation">@dimen/elevation_light</item>-->
<!-- <item name="android:stateListAnimator">@null</item>-->
<!-- </style>-->

<!-- <style name="Button.Tertiary" parent="BaseButton">-->
<!-- <item name="minHeight">@dimen/spacing_28</item>-->
<!-- <item name="elevation">@dimen/elevation_light</item>-->
<!-- <item name="android:stateListAnimator">@null</item>-->
<!-- </style>-->

<!-- <style name="Button.Sticky" parent="BaseButton">-->
<!-- <item name="minHeight">@dimen/spacing_28</item>-->
<!-- <item name="elevation">@dimen/elevation_light</item>-->
<!-- <item name="android:stateListAnimator">@null</item>-->
<!-- </style>-->
</resources>
18 changes: 17 additions & 1 deletion library/src/main/java/com/cube/styleguide/StyleGuideActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
package com.cube.styleguide

import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.cube.styleguide.databinding.ActivityGuidestyleBinding

class StyleGuideActivity : AppCompatActivity() {

companion object {
const val KEY_TEXT_STYLE_PREFIXES_LIST = "KEY_TEXT_STYLE_PREFIXES_LIST"

/**
* @param textPrefixesList - it can be list of strings like: "Body", "Heading", "Caption", "Subtitle", "Bold", "Regular"
* the logic will be searching these represented prefixes in the styles.xml and classify them as textStyles
* */
fun getIntent(context: Context, textPrefixesList: ArrayList<String>?) = Intent(context, StyleGuideActivity::class.java).apply {
this.putStringArrayListExtra(KEY_TEXT_STYLE_PREFIXES_LIST, textPrefixesList)
}
}

private lateinit var binding: ActivityGuidestyleBinding

override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -14,6 +28,8 @@ class StyleGuideActivity : AppCompatActivity() {
binding = ActivityGuidestyleBinding.inflate(layoutInflater)
setContentView(binding.root)

StyleGuideFragment().show(supportFragmentManager, StyleGuideFragment::class.java.name)
StyleGuideFragment.getInstance(
textStylePrefixesList = intent.getStringArrayListExtra(KEY_TEXT_STYLE_PREFIXES_LIST)
).show(supportFragmentManager, StyleGuideFragment::class.java.name)
}
}
Loading

0 comments on commit 524e7b0

Please sign in to comment.