Skip to content

Room Park Android
Room Park Android
Commit d112f556 authored by Vladislav Bogdashkin's avatar Vladislav Bogdashkin 🎣
Browse files
Options

Merge branch 'feature/styles' into develop

parents 075566ee 2ce0f00b
Show whitespace changes
Inline Side-by-side
Showing with 344 additions and 6 deletions
app/src/main/res/drawable/bell_switch_track.xml 0 → 100644
View file @ d112f556
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:width="http://schemas.android.com/apk/res-auto">
<item android:state_checked="false">
<layer-list>
<item>
<shape android:shape="rectangle"
android:dither="true"
android:useLevel="false">
<size android:width="48dp" android:height="24dp"/>
<corners android:radius="12dp"/>
</shape>
</item>
<item
android:right="8dp">
<bitmap
android:width="14dp"
android:height="15dp"
android:src="@drawable/ic_bell_off"
android:tintMode="multiply"
android:gravity="end"
android:tint="@color/colorPrimaryDark" />
</item>
</layer-list>
</item>
<item android:state_checked="true">
<layer-list>
<item>
<shape android:shape="rectangle"
android:dither="true"
android:useLevel="false">
<size android:width="48dp" android:height="24dp"/>
<solid android:color="#FFFFFFFF"/>
<corners android:radius="12dp" />
</shape>
</item>
<item
android:left="8dp">
<bitmap
android:right="27dp"
android:top="5dp"
android:bottom="5dp"
android:src="@drawable/ic_bell_on"
android:mipMap="true"
android:gravity="start"
android:tintMode="screen"
android:tint="@color/colorPrimaryDark" />
</item>
</layer-list>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable/bell_switch_track_tint.xml 0 → 100644
View file @ d112f556
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:color="@color/colorAccent">
</item>
<item android:state_checked="true"
android:color="@color/colorAccent">
</item>
<item android:color="@color/colorOpacityBackgroundInv">
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable/bell_switcher.xml 0 → 100644
View file @ d112f556
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:width="24dp" android:height="24dp">
<shape android:shape="oval">
<size android:width="24dp" android:height="24dp"/>
<stroke
android:width="2dp"
android:color="#00000000" />
<padding
android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp" />
</shape>
</item>
<item android:state_checked="true"
android:width="24dp" android:height="24dp">
<shape android:shape="oval">
<size android:width="24dp" android:height="24dp"/>
<stroke
android:width="2dp"
android:color="#00000000" />
</shape>
</item>
<item>
<shape android:shape="oval">
<size android:width="24dp" android:height="24dp"/>
<stroke
android:width="2dp"
android:color="#00000000" />
</shape>
</item>
</selector>
\ No newline at end of file
app/src/main/res/font/fonts.xml 0 → 100644
View file @ d112f556
<?xml version="1.0" encoding="utf-8"?>
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto">
<font
app:fontStyle="normal"
app:fontWeight="400"
app:font="@font/acrom_regular"
/>
<font
app:fontStyle="normal"
app:fontWeight="100"
app:font="@font/acrom_medium"
/>
</font-family>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @ d112f556
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".MainActivity"> tools:context=".base.RoomParkMainActivity">
<TextView <TextView
android:id="@+id/entryTextView" android:id="@+id/entryTextView"
...@@ -16,4 +16,15 @@ ...@@ -16,4 +16,15 @@
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<include
layout="@layout/bell_switch_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/entryTextView"
app:layout_constraintVertical_bias="0.16000003" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/bell_switch_view.xml 0 → 100644
View file @ d112f556
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switch1"
android:layout_width="48dp"
android:layout_height="24dp"
android:height="24dp"
android:checked="false"
app:switchMinWidth="48dp" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/values/colors.xml
View file @ d112f556
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#008577</color> <color name="colorPrimary">#FFFFFF</color>
<color name="colorPrimaryDark">#00574B</color> <color name="colorPrimaryDark">#FFFFFF</color>
<color name="colorAccent">#D81B60</color> <color name="colorAccent">#227F79</color>
<color name="colorAccentSecondary">#093835</color>
<color name="colorGray">#A1A1A1</color>
<color name="colorOpacityBackgroundInv">#E3E3E3</color>
//region background
<color name="colorCommonBackground">#A1A1A1</color>
<color name="colorNoticeBackground">#EEEEEE</color>
<color name="colorOpacityBackground">#CC000000</color>
<color name="colorCheckListGradientStart">@color/colorAccent</color>
<color name="colorCheckListGradientEnd">@color/colorAccentSecondary</color>
//endregion
//region commons
<color name="colorAttention">#F5A623</color>
<color name="colorError">#B4272D</color>
//endregion
//region text
<color name="colorHeaderText">#222222</color>
<color name="colorCommonText">#000000</color>
<color name="colorNoticeText">#A1A1A1</color>
<color name="colorInvertedText">#FFFFFF</color>
<color name="colorInvertedNoticeText">#A1FFFFFF</color>
//endregion
</resources> </resources>
app/src/main/res/values/styles.xml
View file @ d112f556
<resources> <resources xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorSecondary">@color/colorAccent</item>
<item name="colorSecondaryVariant">@color/colorAccentSecondary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="materialCardViewStyle">@style/Widget.Biganto.MaterialCardView</item>
<item name="switchStyle">@style/Widget.MaterialComponents.CompoundButton.Switch.BellSwitchStyle</item>
</style>
<style name="Widget.MaterialComponents.CompoundButton.Switch.BellSwitchStyle" >
<item name="track" >@drawable/bell_switch_track</item>
<item name="android:thumb" >@drawable/bell_switcher</item>
<item name="thumbTint">@color/colorPrimaryDark</item>
<item name="trackTint">@drawable/bell_switch_track_tint</item>
</style>
<style name="Widget.Biganto.MaterialCardView" parent="Widget.MaterialComponents.CardView">
<item name="cardUseCompatPadding">false</item>
<item name="strokeColor">#1e000000</item>
<item name="strokeWidth">1dp</item>
<item name="cornerFamily">cut</item>
<item name="cornerSize">4dp</item>
</style>
//region TextView
<style name="Base.Widget.AppCompat.TextView.AcromMediumTextView">
<item name="android:fontFamily">@font/acrom_medium</item>
</style>
<style name="Base.Widget.AppCompat.TextView.AcromRegularTextView">
<item name="android:fontFamily">@font/acrom_regular</item>
</style>
<style name="Base.Widget.AppCompat.Button.AcromMediumButton">
<item name="android:fontFamily">@font/acrom_medium</item>
</style>
<style name="Base.Widget.AppCompat.Button.AcromRegularButton">
<item name="android:fontFamily">@font/acrom_regular</item>
</style>
<style name=".Header_TextView" parent="Base.Widget.AppCompat.TextView.AcromMediumTextView">
<item name="android:textSize">@dimen/main_header</item>
</style>
<style name=".Main_Header" parent=".Header_TextView">
<item name="android:textColor">@color/colorHeaderText</item>
</style>
<style name=".Accent_Header" parent=".Header_TextView">
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name=".Inverted_Header" parent=".Header_TextView">
<item name="android:textColor">@color/colorCommonText</item>
</style>
<style name=".Flat_Input_TextView" parent="Base.Widget.AppCompat.TextView.AcromMediumTextView">
<item name="android:textSize">@dimen/super_size</item>
</style>
<style name=".Flat_Text" parent=".Flat_Input_TextView">
<item name="android:textColor">@color/colorHeaderText</item>
</style>
<style name=".Flat_Error" parent=".Flat_Input_TextView">
<item name="android:textColor">@color/colorError</item>
</style>
<style name=".Flat_Notice" parent=".Flat_Input_TextView">
<item name="android:textColor">@color/colorNoticeText</item>
</style>
<style name=".Currency_TextView" parent="Base.Widget.AppCompat.TextView.AcromMediumTextView">
<item name="android:textSize">@dimen/currency</item>
</style>
<style name=".Currency" parent=".Currency_TextView">
<item name="android:textColor">@color/colorHeaderText</item>
</style> </style>
<style name=".Currency_Accent" parent=".Currency_TextView">
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name=".Default_TextView" parent="Base.Widget.AppCompat.TextView.AcromMediumTextView">
<item name="android:textSize">@dimen/accent_header</item>
</style>
<style name=".Accent_Text" parent=".Default_TextView">
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name=".Header_Text" parent=".Default_TextView">
<item name="android:textColor">@color/colorHeaderText</item>
</style>
<style name=".Inverted_Text" parent=".Default_TextView">
<item name="android:textColor">@color/colorInvertedText</item>
</style>
<style name=".Feed_Title" parent="Base.Widget.AppCompat.TextView.AcromMediumTextView">
<item name="android:textSize">@dimen/common_text</item>
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name=".Common_Text" parent="Base.Widget.AppCompat.TextView.AcromRegularTextView">
<item name="android:textSize">@dimen/common_text</item>
</style>
<style name=".Default" parent=".Common_Text">
<item name="android:textColor">@color/colorCommonText</item>
</style>
<style name=".Notice" parent=".Common_Text">
<item name="android:textColor">@color/colorNoticeText</item>
</style>
<style name=".Inverted" parent=".Common_Text">
<item name="android:textColor">@color/colorInvertedText</item>
</style>
<style name="Inverted_Notice" parent=".Common_Text">
<item name="android:textColor">@color/colorInvertedNoticeText</item>
</style>
<style name=".Accent_Minor_TextView" parent="Base.Widget.AppCompat.TextView.AcromMediumTextView">
<item name="android:textSize">@dimen/minor_text</item>
</style>
<style name=".Default" parent=".Accent_Minor_TextView">
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name=".Inverted" parent=".Accent_Minor_TextView">
<item name="android:textColor">@color/colorNoticeText</item>
</style>
<style name=".Feed" parent="Base.Widget.AppCompat.TextView.AcromRegularTextView">
<item name="android:textSize">@dimen/lite_notice</item>
</style>
<style name=".Notice" parent=".Accent_Minor_TextView">
<item name="android:textColor">@color/colorNoticeText</item>
</style>
<style name=".Description" parent=".Accent_Minor_TextView">
<item name="android:textColor">@color/colorCommonText</item>
</style>
//endregion
</resources> </resources>
app/src/main/res/values/text_size.xml 0 → 100644
View file @ d112f556
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="main_header">32sp</dimen>
<dimen name="super_size">128sp</dimen>
<dimen name="accent_header">16sp</dimen>
<dimen name="minor_text">12sp</dimen>
<dimen name="common_text">14sp</dimen>
<dimen name="currency">24sp</dimen>
<dimen name="lite_notice">11sp</dimen>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment