Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Room Park Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav Bogdashkin
Room Park Android
Commits
c697669f
Commit
c697669f
authored
Sep 12, 2019
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added feeds screen contained views
parent
d991209e
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
160 additions
and
6 deletions
+160
-6
catalog_item_mask.xml
app/src/main/res/drawable/catalog_item_mask.xml
+6
-0
default_image_placeholder.png
app/src/main/res/drawable/default_image_placeholder.png
+0
-0
rounded_text.xml
app/src/main/res/drawable/rounded_text.xml
+6
-0
cam_button_viewholder.xml
app/src/main/res/layout/cam_button_viewholder.xml
+47
-0
estate_card_viewholder.xml
app/src/main/res/layout/estate_card_viewholder.xml
+64
-0
feed_viewholder.xml
app/src/main/res/layout/feed_viewholder.xml
+2
-2
colors.xml
app/src/main/res/values/colors.xml
+2
-1
styles.xml
app/src/main/res/values/styles.xml
+33
-3
No files found.
app/src/main/res/drawable/catalog_item_mask.xml
0 → 100644
View file @
c697669f
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:radius=
"4px"
/>
<solid
android:color=
"@color/colorOpacityCardBackground"
/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/default_image_placeholder.png
0 → 100644
View file @
c697669f
281 KB
app/src/main/res/drawable/rounded_text.xml
0 → 100644
View file @
c697669f
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:radius=
"12dp"
/>
<solid
android:color=
"@color/colorCommonBackground"
/>
</shape>
\ No newline at end of file
app/src/main/res/layout/cam_button_viewholder.xml
0 → 100644
View file @
c697669f
<?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=
"match_parent"
android:layout_height=
"46dp"
xmlns:style=
"http://schemas.android.com/tools"
android:orientation=
"horizontal"
>
<ImageView
android:id=
"@+id/imageView2"
android:layout_width=
"24dp"
android:layout_height=
"24dp"
android:layout_gravity=
"start|center_vertical"
android:layout_weight=
"0"
app:srcCompat=
"@drawable/ic_favorites"
/>
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/textView7"
style=
"@style/Accent_Minor_TextView.Default"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"16dp"
android:layout_weight=
"1"
android:gravity=
"center_vertical|fill_vertical"
android:text=
"TextView"
android:textAlignment=
"viewStart"
/>
<ImageView
android:id=
"@+id/imageView3"
android:layout_width=
"8dp"
android:layout_height=
"8dp"
android:layout_gravity=
"start|center_vertical"
android:layout_margin=
"4dp"
android:layout_weight=
"0"
android:tint=
"@color/colorAccent"
app:srcCompat=
"@drawable/new_feed_icon"
/>
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/textView8"
style=
"@style/Feed.Notice"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_weight=
"0"
android:gravity=
"center_vertical|fill_vertical"
android:text=
"ОНЛАЙН"
android:textAlignment=
"viewStart"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/estate_card_viewholder.xml
0 → 100644
View file @
c697669f
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"284dp"
android:layout_height=
"189dp"
app:cardElevation=
"0dp"
app:cardForegroundColor=
"#00000000"
app:cardPreventCornerOverlap=
"false"
app:cardUseCompatPadding=
"false"
>
<com.biganto.visual.roompark.view_utils.image_view.RoundedImageView
android:id=
"@+id/imageView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:adjustViewBounds=
"true"
android:background=
"@drawable/default_image_placeholder"
android:cropToPadding=
"true"
android:foreground=
"@drawable/catalog_item_mask"
android:scaleType=
"centerCrop"
app:image_corner_radius=
"4dp"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/textView5"
style=
"@style/Header_TextView.Inverted_Header"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"64dp"
android:layout_marginBottom=
"4dp"
android:text=
"Дом №1"
android:textAlignment=
"center"
/>
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/textView6"
style=
"@style/Common_Text.Inverted"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"Последнее обновление"
android:textAlignment=
"center"
/>
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/button"
style=
"@style/Accent_Minor_TextView.DatePlaceHolder"
android:layout_width=
"match_parent"
android:layout_height=
"24dp"
android:layout_marginStart=
"64dp"
android:layout_marginTop=
"4dp"
android:layout_marginEnd=
"64dp"
android:gravity=
"center"
android:maxLines=
"1"
android:text=
"14 декабря 2019г"
android:textAlignment=
"center"
/>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
</FrameLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
app/src/main/res/layout/feed_viewholder.xml
View file @
c697669f
...
@@ -51,10 +51,10 @@
...
@@ -51,10 +51,10 @@
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<TextView
style=
"@style/
Feed.Description
"
style=
"@style/
Common_Text.Inverted
"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:
layout_marginTop=
"4dp
"
android:
includeFontPadding=
"false
"
android:maxLines=
"3"
android:maxLines=
"3"
android:text=
"В «РУМЯНЦЕВО-ПАРК» ПРИСТУПИЛИ К МОНТАЖУ ОКОННЫХ БЛОКОВ"
android:text=
"В «РУМЯНЦЕВО-ПАРК» ПРИСТУПИЛИ К МОНТАЖУ ОКОННЫХ БЛОКОВ"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
...
...
app/src/main/res/values/colors.xml
View file @
c697669f
...
@@ -6,13 +6,14 @@
...
@@ -6,13 +6,14 @@
<color
name=
"colorAccentSecondary"
>
#093835
</color>
<color
name=
"colorAccentSecondary"
>
#093835
</color>
<color
name=
"colorGray"
>
#A1A1A1
</color>
<color
name=
"colorGray"
>
#A1A1A1
</color>
<color
name=
"colorOpacityBackgroundInv"
>
#E3E3E3
</color>
<color
name=
"colorOpacityBackgroundInv"
>
#E3E3E3
E3
</color>
//region background
//region background
<color
name=
"colorCommonBackground"
>
#FFFFFF
</color>
<color
name=
"colorCommonBackground"
>
#FFFFFF
</color>
<color
name=
"colorNoticeBackground"
>
#EEEEEE
</color>
<color
name=
"colorNoticeBackground"
>
#EEEEEE
</color>
<color
name=
"colorOpacityBackground"
>
#CC000000
</color>
<color
name=
"colorOpacityBackground"
>
#CC000000
</color>
<color
name=
"colorOpacityCardBackground"
>
#5C000000
</color>
<color
name=
"colorCheckListGradientStart"
>
@color/colorAccent
</color>
<color
name=
"colorCheckListGradientStart"
>
@color/colorAccent
</color>
<color
name=
"colorCheckListGradientEnd"
>
@color/colorAccentSecondary
</color>
<color
name=
"colorCheckListGradientEnd"
>
@color/colorAccentSecondary
</color>
//endregion
//endregion
...
...
app/src/main/res/values/styles.xml
View file @
c697669f
...
@@ -25,8 +25,7 @@
...
@@ -25,8 +25,7 @@
<style
name=
"Widget.Biganto.MaterialCardView"
parent=
"Widget.MaterialComponents.CardView"
>
<style
name=
"Widget.Biganto.MaterialCardView"
parent=
"Widget.MaterialComponents.CardView"
>
<item
name=
"cardUseCompatPadding"
>
false
</item>
<item
name=
"cardUseCompatPadding"
>
false
</item>
<item
name=
"strokeColor"
>
#1e000000
</item>
<item
name=
"strokeWidth"
>
0dp
</item>
<item
name=
"strokeWidth"
>
1dp
</item>
<item
name=
"cornerFamily"
>
cut
</item>
<item
name=
"cornerFamily"
>
cut
</item>
<item
name=
"cornerSize"
>
4dp
</item>
<item
name=
"cornerSize"
>
4dp
</item>
</style>
</style>
...
@@ -118,6 +117,24 @@
...
@@ -118,6 +117,24 @@
</style>
>
</style>
>
<style
name=
"DevProgressButton"
parent=
"Widget.MaterialComponents.Button.UnelevatedButton"
>
<item
name=
"strokeWidth"
>
1dp
</item>
<item
name=
"android:colorBackground"
>
@color/colorCommonBackground
</item>
<item
name=
"android:colorControlNormal"
>
@color/colorCommonBackground
</item>
<item
name=
"android:colorControlActivated"
>
@color/colorCommonBackground
</item>
<item
name=
"boxBackgroundColor"
>
@color/colorCommonBackground
</item>
<item
name=
"android:layout_height"
>
24dp
</item>
<item
name=
"android:layout_width"
>
128dp
</item>
<item
name=
"cornerRadius"
>
12dp
</item>
<item
name=
"rippleColor"
>
@color/colorGray
</item>
<item
name=
"android:textSize"
>
@dimen/minor_text
</item>
<item
name=
"android:textColor"
>
@color/colorHeaderText
</item>
<item
name=
"android:fontFamily"
>
@font/acrom_medium
</item>
<item
name=
"android:gravity"
>
center
</item>
</style>
//region TextView
//region TextView
<style
name=
"Base.Widget.AppCompat.TextView.AcromMediumTextView"
>
<style
name=
"Base.Widget.AppCompat.TextView.AcromMediumTextView"
>
...
@@ -149,7 +166,7 @@
...
@@ -149,7 +166,7 @@
</style>
</style>
<style
name=
"Header_TextView.Inverted_Header"
>
<style
name=
"Header_TextView.Inverted_Header"
>
<item
name=
"android:textColor"
>
@color/color
Common
Text
</item>
<item
name=
"android:textColor"
>
@color/color
Inverted
Text
</item>
</style>
</style>
<style
name=
"Flat_Input_TextView"
parent=
"Base.Widget.AppCompat.TextView.AcromMediumTextView"
>
<style
name=
"Flat_Input_TextView"
parent=
"Base.Widget.AppCompat.TextView.AcromMediumTextView"
>
...
@@ -202,6 +219,10 @@
...
@@ -202,6 +219,10 @@
<item
name=
"android:textColor"
>
@color/colorAccent
</item>
<item
name=
"android:textColor"
>
@color/colorAccent
</item>
</style>
</style>
<style
name=
"Feed_Title.Disclaimer"
>
<item
name=
"android:textColor"
>
@color/colorInvertedText
</item>
</style>
<style
name=
"Common_Text"
parent=
"Base.Widget.AppCompat.TextView.AcromRegularTextView"
>
<style
name=
"Common_Text"
parent=
"Base.Widget.AppCompat.TextView.AcromRegularTextView"
>
<item
name=
"android:textSize"
>
@dimen/common_text
</item>
<item
name=
"android:textSize"
>
@dimen/common_text
</item>
</style>
</style>
...
@@ -234,6 +255,15 @@
...
@@ -234,6 +255,15 @@
<item
name=
"android:textColor"
>
@color/colorNoticeText
</item>
<item
name=
"android:textColor"
>
@color/colorNoticeText
</item>
</style>
</style>
<style
name=
"Accent_Minor_TextView.DatePlaceHolder"
>
<item
name=
"android:textColor"
>
@color/colorCommonText
</item>
<item
name=
"android:background"
>
@drawable/rounded_text
</item>
<item
name=
"android:paddingStart"
>
12dp
</item>
<item
name=
"android:paddingEnd"
>
12dp
</item>
</style>
<style
name=
"Feed"
parent=
"Base.Widget.AppCompat.TextView.AcromRegularTextView"
>
<style
name=
"Feed"
parent=
"Base.Widget.AppCompat.TextView.AcromRegularTextView"
>
<item
name=
"android:textSize"
>
@dimen/lite_notice
</item>
<item
name=
"android:textSize"
>
@dimen/lite_notice
</item>
</style>
</style>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment