Skip to content

Commit 20ca9a6

Browse files
SUPERCILEXsamtstern
authored andcommitted
Update style guide (#712)
1 parent cffc660 commit 20ca9a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+437
-222
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.gradle
22
*.iml
33
/local.properties
4-
.idea
4+
.idea/**
55
!.idea/codeStyleSettings.xml
66
.DS_Store
77
build

.idea/codeStyleSettings.xml

Lines changed: 207 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/res/drawable/chat_message_arrow.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<rotate
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:fromDegrees="45"
5-
android:toDegrees="45"
65
android:pivotX="-40%"
7-
android:pivotY="87%">
6+
android:pivotY="87%"
7+
android:toDegrees="45">
88
<shape
99
android:shape="rectangle">
1010
<stroke
11-
android:color="@android:color/transparent"
12-
android:width="10dp"/>
13-
<solid android:color="@color/material_gray_300"/>
11+
android:width="10dp"
12+
android:color="@android:color/transparent" />
13+
<solid android:color="@color/material_gray_300" />
1414
</shape>
15-
</rotate>
15+
</rotate>

app/src/main/res/drawable/chat_message_background.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<shape
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:shape="rectangle">
5-
<corners android:radius="4dp"/>
6-
<solid android:color="@color/material_gray_300"/>
5+
<corners android:radius="4dp" />
6+
<solid android:color="@color/material_gray_300" />
77
</shape>

app/src/main/res/layout/activity_chat.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,47 @@
1010
android:id="@+id/emptyTextView"
1111
android:layout_width="match_parent"
1212
android:layout_height="wrap_content"
13-
android:text="@string/start_chatting"
14-
android:padding="16dp" />
13+
android:padding="16dp"
14+
android:text="@string/start_chatting" />
1515

1616
<android.support.v7.widget.RecyclerView
1717
android:id="@+id/messagesList"
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
20-
android:layout_above="@+id/footer"
21-
android:layout_alignParentLeft="true"
2220
android:layout_alignParentStart="true"
21+
android:layout_alignParentLeft="true"
2322
android:layout_alignParentTop="true"
23+
android:layout_above="@+id/footer"
2424
android:clipToPadding="false"
2525
android:padding="16dp"
26-
tools:listitem="@layout/message"/>
26+
tools:listitem="@layout/message" />
2727

2828
<LinearLayout
2929
android:id="@+id/footer"
3030
android:layout_width="match_parent"
3131
android:layout_height="wrap_content"
32-
android:layout_alignParentBottom="true"
33-
android:layout_alignParentLeft="true"
3432
android:layout_alignParentStart="true"
35-
android:orientation="horizontal"
33+
android:layout_alignParentLeft="true"
34+
android:layout_alignParentBottom="true"
35+
android:paddingStart="16dp"
3636
android:paddingEnd="16dp"
3737
android:paddingLeft="16dp"
38-
android:paddingStart="16dp">
38+
android:orientation="horizontal">
3939

4040
<EditText
4141
android:id="@+id/messageEdit"
4242
android:layout_width="0dp"
4343
android:layout_height="wrap_content"
4444
android:layout_weight="1"
45-
android:inputType="text"/>
45+
android:inputType="text" />
4646

4747
<Button
4848
android:id="@+id/sendButton"
4949
style="@style/Widget.AppCompat.Button.Borderless.Colored"
5050
android:layout_width="wrap_content"
5151
android:layout_height="wrap_content"
5252
android:layout_gravity="bottom|end"
53-
android:text="@string/send"/>
53+
android:text="@string/send" />
5454

5555
</LinearLayout>
5656

app/src/main/res/layout/activity_chooser.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
android:orientation="vertical"
7-
android:paddingBottom="@dimen/activity_vertical_margin"
86
android:paddingLeft="@dimen/activity_horizontal_margin"
97
android:paddingRight="@dimen/activity_horizontal_margin"
10-
android:paddingTop="@dimen/activity_vertical_margin">
8+
android:paddingTop="@dimen/activity_vertical_margin"
9+
android:paddingBottom="@dimen/activity_vertical_margin"
10+
android:orientation="vertical">
1111

1212
<android.support.v7.widget.RecyclerView
1313
android:id="@+id/activities"
1414
android:layout_width="match_parent"
15-
android:layout_height="match_parent"/>
15+
android:layout_height="match_parent" />
1616

1717
</LinearLayout>

0 commit comments

Comments
 (0)