Skip to content

Update style guide #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 12, 2017
Merged

Update style guide #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee8c4ea
Update style guide
SUPERCILEX May 13, 2017
ecdb7a8
Update xml files with new style guide
SUPERCILEX May 13, 2017
21793e7
Merge remote-tracking branch 'upstream/version-2.0.0-dev' into style-…
SUPERCILEX Jun 2, 2017
ac8be85
Merge remote-tracking branch 'upstream/master' into style-guide
SUPERCILEX Jun 12, 2017
de8ffb5
More cleanup
SUPERCILEX Jun 12, 2017
01755e0
Fix issues
SUPERCILEX Jun 12, 2017
c5576d5
More fixes
SUPERCILEX Jun 12, 2017
4733f3b
Final round of fixes
SUPERCILEX Jun 12, 2017
b39c85e
Update AuthUI.java
SUPERCILEX Jun 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.gradle
*.iml
/local.properties
.idea
.idea/**
!.idea/codeStyleSettings.xml
.DS_Store
build
Expand Down
211 changes: 207 additions & 4 deletions .idea/codeStyleSettings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions app/src/main/res/drawable/chat_message_arrow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<rotate
xmlns:android="http://schemas.android.com/apk/res/android"
android:fromDegrees="45"
android:toDegrees="45"
android:pivotX="-40%"
android:pivotY="87%">
android:pivotY="87%"
android:toDegrees="45">
<shape
android:shape="rectangle">
<stroke
android:color="@android:color/transparent"
android:width="10dp"/>
<solid android:color="@color/material_gray_300"/>
android:width="10dp"
android:color="@android:color/transparent" />
<solid android:color="@color/material_gray_300" />
</shape>
</rotate>
</rotate>
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/chat_message_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp"/>
<solid android:color="@color/material_gray_300"/>
<corners android:radius="4dp" />
<solid android:color="@color/material_gray_300" />
</shape>
22 changes: 11 additions & 11 deletions app/src/main/res/layout/activity_chat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,47 +10,47 @@
android:id="@+id/emptyTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/start_chatting"
android:padding="16dp" />
android:padding="16dp"
android:text="@string/start_chatting" />

<android.support.v7.widget.RecyclerView
android:id="@+id/messagesList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/footer"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_above="@+id/footer"
android:clipToPadding="false"
android:padding="16dp"
tools:listitem="@layout/message"/>
tools:listitem="@layout/message" />

<LinearLayout
android:id="@+id/footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:orientation="horizontal"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingLeft="16dp"
android:paddingStart="16dp">
android:orientation="horizontal">

<EditText
android:id="@+id/messageEdit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="text"/>
android:inputType="text" />

<Button
android:id="@+id/sendButton"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:text="@string/send"/>
android:text="@string/send" />

</LinearLayout>

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_chooser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:orientation="vertical">

<android.support.v7.widget.RecyclerView
android:id="@+id/activities"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />

</LinearLayout>
Loading