Skip to content

Commit 58dace1

Browse files
author
Prateek Prasad
committed
Copy design module from publish to samples app
1 parent 74abdf3 commit 58dace1

26 files changed

+355
-10
lines changed

.gitignore

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,23 @@
99
/build
1010
/captures
1111
.externalNativeBuild
12-
.idea
12+
.idea
13+
*.apk
14+
*.ap_
15+
*.dex
16+
*.class
17+
bin/
18+
gen/
19+
out/
20+
build/
21+
workspace.xml
22+
local.properties
23+
ks.properties
24+
.classpath
25+
.project
26+
lint.xml
27+
protected_strings.xml
28+
/dist
29+
/dexguard
30+
googlePlay/
31+
captures/

design/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

design/build.gradle

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
apply plugin: 'com.android.library'
3+
apply plugin: 'kotlin-android'
4+
apply plugin: 'kotlin-android-extensions'
5+
6+
android {
7+
compileSdkVersion 29
8+
defaultConfig {
9+
minSdkVersion 21
10+
targetSdkVersion 29
11+
}
12+
}
13+
dependencies {
14+
api project(':app')
15+
implementation 'com.google.android.material:material:1.1.0'
16+
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72"
17+
}

design/consumer-rules.pro

Whitespace-only changes.

design/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

design/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="org.buffer.android.components.design" />
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:duration="250"
4+
android:interpolator="@android:anim/accelerate_decelerate_interpolator">
5+
6+
<translate
7+
android:fromYDelta="20%p"
8+
android:toYDelta="0"/>
9+
10+
<alpha
11+
android:fromAlpha="0.0"
12+
android:toAlpha="1.0"/>
13+
14+
</set>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:duration="200"
4+
android:interpolator="@android:anim/accelerate_interpolator">
5+
6+
<translate
7+
android:fromYDelta="0"
8+
android:toYDelta="20%p"/>
9+
10+
<alpha
11+
android:fromAlpha="1.0"
12+
android:toAlpha="0.0"/>
13+
14+
</set>
Loading
Loading
Loading
Loading
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:color="?android:colorControlHighlight">
4+
<item>
5+
<shape android:shape="rectangle">
6+
<solid android:color="?colorOnSurface" />
7+
<corners android:radius="4dp" />
8+
<stroke
9+
android:width="0.5dp"
10+
android:color="@color/color_on_surface_border" />
11+
</shape>
12+
</item>
13+
</ripple>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="12dp"
3+
android:height="12dp"
4+
android:viewportWidth="12"
5+
android:viewportHeight="12">
6+
<path
7+
android:pathData="M6,6m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
8+
android:fillColor="#9C2BFF"/>
9+
</vector>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M21.2135,1.2557C20.6277,0.67 19.6779,0.67 19.0922,1.2557L18.0315,2.3164L21.2135,5.4984L22.2741,4.4377C22.8599,3.8519 22.8599,2.9022 22.2741,2.3164L21.2135,1.2557Z"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M16.9709,3.377L20.1529,6.559L7.425,19.2869L3.8531,21.0728C3.4525,21.2731 2.9687,21.1946 2.652,20.8779C2.3353,20.5612 2.2567,20.0774 2.4571,19.6768L4.243,16.1049L16.9709,3.377Z"
11+
android:fillColor="#ffffff"/>
12+
</vector>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:color="?colorOnSurface">
4+
<item android:drawable="@color/white" />
5+
</ripple>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:tools="http://schemas.android.com/tools">
3+
4+
<style name="Base.PublishThemeBuilder" parent="Theme.MaterialComponents.DayNight.NoActionBar">
5+
<item name="android:statusBarColor">?colorSurface</item>
6+
<item name="android:windowLightStatusBar">true</item>
7+
<item name="android:navigationBarColor">@color/black</item>
8+
<item name="android:navigationBarDividerColor" tools:ignore="NewApi">?colorControlHighlight</item>
9+
10+
<item name="colorPrimaryDark">?colorPrimaryVariant</item>
11+
<item name="colorAccent">?colorSecondary</item>
12+
</style>
13+
</resources>

design/src/main/res/values/color.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="color_primary">@color/white</color>
4+
<color name="color_primary_variant">@color/gray_darker</color>
5+
<color name="color_secondary">@color/curious_blue</color>
6+
<color name="color_secondary_variant">@color/curious_blue_dark</color>
7+
8+
<!--colorBackground appears behind scrollable content and is used for the default window-->
9+
<!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
10+
<!--and menus. colorError is used to indicate an error state for components such as-->
11+
<!--text fields.-->
12+
<color name="color_background">@color/gray_lighter</color>
13+
<color name="color_surface">@color/white</color>
14+
<color name="color_error">@color/red_dark</color>
15+
16+
<!--"On" colors define how text, icons and strokes are colored in relation to the surface-->
17+
<!--on which they appear.-->
18+
<color name="color_on_primary">@color/text_primary</color>
19+
<color name="color_on_primary_inverse">@color/white</color>
20+
<color name="color_on_primary_70">#E63D3D3D</color>
21+
<color name="color_on_primary_20">#333D3D3D</color>
22+
<color name="color_primary_as_surface">#F5F5F5</color>
23+
<color name="color_secondary_as_surface">#1A2C4BFF</color>
24+
<color name="color_on_secondary">@color/white</color>
25+
<color name="color_on_background">@color/text_secondary</color>
26+
<color name="color_on_surface">@color/gray_lighter</color>
27+
<color name="color_on_surface_border">@color/gray_light</color>
28+
<color name="color_on_error">@color/white</color>
29+
30+
<color name="message_background">#f4f7f9</color>
31+
<color name="unselected_item">#B8B8B8</color>
32+
<color name="text_on_colored_surface">@color/black</color>
33+
<color name="text_on_surface">@color/gray_dark</color>
34+
<color name="search_background">@color/gray_lighter</color>
35+
36+
<color name="text_primary">@color/gray_darker</color>
37+
<color name="text_secondary">@color/gray_dark</color>
38+
</resources>

design/src/main/res/values/dimens.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<dimen name="material_card_stroke_width">0.5dp</dimen>
4+
<dimen name="button_radius">4dp</dimen>
5+
<dimen name="content_action_padding">6dp</dimen>
6+
7+
<dimen name="one_space">8dp</dimen>
8+
<dimen name="two_space">16dp</dimen>
9+
10+
<dimen name="item_content_vertical_padding">0dp</dimen>
11+
<dimen name="item_content_horizontal_padding">0dp</dimen>
12+
13+
<dimen name="buffer_card_width">340dp</dimen>
14+
<dimen name="tabbed_content_top_margin_to_center">180dp</dimen>
15+
<dimen name="error_view_top_offset">-120dp</dimen>
16+
</resources>

design/src/main/res/values/motion.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!--
2+
~ Copyright (C) 2019 The Android Open Source Project
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
17+
<resources>
18+
19+
<!--Motion-->
20+
21+
<style name="Animation.MyTheme.BottomSheet.Modal" parent="Animation.AppCompat.Dialog">
22+
<item name="android:windowEnterAnimation">@anim/bottom_sheet_slide_in</item>
23+
<item name="android:windowExitAnimation">@anim/bottom_sheet_slide_out</item>
24+
</style>
25+
26+
</resources>

design/src/main/res/values/styles.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<resources xmlns:tools="http://schemas.android.com/tools">
4+
5+
<style name="ThemeOverlay.PublishTheme.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.Dialog">
6+
<item name="android:windowIsFloating">false</item>
7+
<item name="android:windowBackground">@android:color/transparent</item>
8+
<item name="android:windowAnimationStyle">@style/Animation.MyTheme.BottomSheet.Modal</item>
9+
<item name="android:statusBarColor">@android:color/transparent</item>
10+
<item name="bottomSheetStyle">@style/Widget.PublishTheme.BottomSheet.Modal</item>
11+
<item name="android:navigationBarColor">?colorSurface</item>
12+
<item name="android:navigationBarDividerColor" tools:ignore="NewApi">@android:color/transparent</item>
13+
</style>
14+
15+
<style name="Widget.PublishTheme.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
16+
<item name="shapeAppearanceOverlay">?shapeAppearanceLargeComponent</item>
17+
</style>
18+
19+
<style name="Widget.PublishTheme.NavigationView" parent="Widget.MaterialComponents.NavigationView">
20+
<item name="itemTextAppearance">?textAppearanceBody2</item>
21+
</style>
22+
23+
<style name="ThemeOverlay.PublishTheme.TextButton" parent="Widget.MaterialComponents.Button.TextButton">
24+
<item name="rippleColor">@color/color_on_primary_20</item>
25+
</style>
26+
</resources>

design/src/main/res/values/themes.xml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:tools="http://schemas.android.com/tools">
3+
4+
<style name="PublishTheme.DayNight" parent="Base.PublishTheme"/>
5+
6+
<style name="Base.PublishTheme" parent="Base.PublishThemeBuilder">
7+
<item name="colorPrimary">@color/color_primary</item>
8+
<item name="colorPrimaryVariant">@color/color_primary_variant</item>
9+
<item name="colorPrimaryDark">@color/color_on_primary</item>
10+
<item name="colorSecondary">@color/color_secondary</item>
11+
<item name="colorSecondaryVariant">@color/color_secondary_variant</item>
12+
13+
<item name="android:colorBackground">@color/color_background</item>
14+
<item name="colorSurface">@color/color_surface</item>
15+
<item name="colorError">@color/color_error</item>
16+
17+
<item name="colorOnPrimary">@color/color_on_primary</item>
18+
<item name="colorOnSecondary">@color/color_on_secondary</item>
19+
<item name="colorOnBackground">@color/color_on_background</item>
20+
<item name="colorOnSurface">@color/color_on_surface</item>
21+
<item name="colorOnError">@color/color_on_error</item>
22+
<item name="android:windowBackground">@color/color_background</item>
23+
24+
<item name="materialAlertDialogTheme">@style/MaterialDialogTheme</item>
25+
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.PublishTheme.BottomSheetDialog</item>
26+
<item name="navigationViewStyle">@style/Widget.PublishTheme.NavigationView</item>
27+
<item name="toolbarStyle">@style/ToolbarTheme</item>
28+
<item name="snackbarStyle">@style/SnackbarTheme</item>
29+
<item name="textInputStyle">@style/TextInputLayoutTheme</item>
30+
<item name="colorControlNormal">?android:textColorPrimary</item>
31+
<item name="android:textColorPrimary">@color/text_primary</item>
32+
<item name="android:textColorSecondary">@color/text_secondary</item>
33+
</style>
34+
35+
<style name="TextInputLayoutTheme" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
36+
<item name="boxBackgroundColor">@color/gray_lighter</item>
37+
<item name="android:textColorHint">?android:textColorSecondary</item>
38+
<item name="hintTextColor">?colorSecondary</item>
39+
<item name="materialThemeOverlay">@style/TextInputLayoutAppearance</item>
40+
</style>
41+
42+
<style name="TextInputLayoutAppearance" parent="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox">
43+
<item name="colorControlNormal">?colorSecondary</item>
44+
<item name="colorControlActivated">?colorSecondary</item>
45+
<item name="colorControlHighlight">?colorSecondary</item>
46+
</style>
47+
48+
<style name="MaterialDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
49+
<item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
50+
<item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
51+
<item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
52+
<item name="materialAlertDialogTitleTextStyle">@style/TitleTextStyle</item>
53+
<item name="materialAlertDialogBodyTextStyle">@style/BodyTextStyle</item>
54+
</style>
55+
56+
<style name="TitleTextStyle" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
57+
<item name="android:textColor">?android:textColorPrimary</item>
58+
<item name="android:textStyle">bold</item>
59+
<item name="android:textSize">@dimen/text_title</item>
60+
</style>
61+
62+
<style name="BodyTextStyle" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
63+
<item name="android:textColor">?android:textColorPrimary</item>
64+
<item name="android:textSize">@dimen/text_body</item>
65+
</style>
66+
67+
<style name="AlertButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
68+
<item name="android:textColor">@color/colorAccent</item>
69+
</style>
70+
71+
<style name="SnackbarTheme" parent="@style/Widget.MaterialComponents.Snackbar">
72+
<item name="android:background">@color/gray_darker</item>
73+
</style>
74+
75+
<style name="ToolbarTheme" parent="@style/Widget.MaterialComponents.Toolbar.Surface">
76+
<item name="titleTextColor">?android:textColorPrimary</item>
77+
<item name="colorControlNormal">?android:textColorPrimary</item>
78+
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
79+
</style>
80+
81+
<style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
82+
<item name="color">?android:textColorPrimary</item>
83+
</style>
84+
85+
<style name="Base.PublishThemeBuilder" parent="Theme.MaterialComponents.DayNight.NoActionBar">
86+
<item name="android:statusBarColor">?colorOnBackground</item>
87+
<item name="android:navigationBarColor">?colorPrimaryVariant</item>
88+
<item name="android:navigationBarDividerColor" tools:ignore="NewApi">?colorControlHighlight</item>
89+
90+
<item name="colorPrimaryDark">?colorPrimaryVariant</item>
91+
<item name="colorAccent">?colorSecondary</item>
92+
</style>
93+
94+
<style name="Publish.NoActionBar" parent="PublishTheme.DayNight">
95+
<item name="windowActionBar">false</item>
96+
<item name="windowNoTitle">true</item>
97+
</style>
98+
99+
</resources>

sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
}
2727

2828
dependencies {
29-
implementation project(':app')
29+
implementation project(':design')
3030
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3131
implementation 'androidx.appcompat:appcompat:1.1.0'
3232
implementation 'androidx.core:core-ktx:1.2.0'

sample/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
11+
android:theme="@style/Theme.Publish">
1212
<activity android:name=".MainActivity">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />

0 commit comments

Comments
 (0)