Skip to content
Snippets Groups Projects
Commit e3c730d9 authored by Michi302's avatar Michi302
Browse files

Merge branch 'master' into fdroid 

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/com/commit451/gitlab/LabCoatApp.java
parents 28c09fb7 e73b1aab
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 359 additions and 307 deletions
app/src/main/res/layout/item_account.xml
+ 1
− 2
View file @ e3c730d9
@@ -10,14 +10,13 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:foreground="?attr/selectableItemBackground">
 
<de.hdodenhof.circleimageview.CircleImageView
<ImageView
android:id="@+id/account_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_marginRight="8dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
android:transitionName="@string/transition_user"
tools:src="@drawable/ic_assign_24dp"
/>
 
app/src/main/res/layout/item_assignee.xml
+ 1
− 1
View file @ e3c730d9
@@ -8,7 +8,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:padding="8dp">
 
<de.hdodenhof.circleimageview.CircleImageView
<ImageView
android:id="@+id/user_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
app/src/main/res/layout/item_commit.xml
+ 57
− 50
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:background="?attr/selectableItemBackground">
android:background="?attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeight">
 
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/commit_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:contentDescription="@null"
tools:src="@drawable/ic_doc"
/>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/commit_image"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginRight="16dp"
>
android:orientation="horizontal">
 
<TextView
android:id="@+id/commit_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_small"
android:textColor="?android:attr/textColorPrimary"
android:maxLines="2"
android:ellipsize="end"
tools:text="I commited all the code at once cause I am cool. So sorry"/>
<ImageView
android:id="@+id/commit_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:contentDescription="@null"
tools:src="@drawable/ic_star_24dp" />
 
<TextView
android:id="@+id/commit_author"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/commit_message"
android:textSize="@dimen/text_size_tiny"
android:textColor="?android:attr/textColorSecondary"
tools:text="Jawnnypoo"/>
android:orientation="vertical"
android:layout_margin="8dp">
 
<TextView
android:id="@+id/commit_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/commit_message"
android:layout_alignParentRight="true"
<TextView
android:id="@+id/commit_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_small"
tools:text="I commited all the code at once cause I am cool. So sorry" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
 
android:textSize="@dimen/text_size_tiny"
android:textColor="?android:attr/textColorSecondary"
tools:text="Max 25, 2019"/>
<TextView
android:id="@+id/commit_author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_tiny"
tools:text="Jawnnypoo" />
 
</RelativeLayout>
<TextView
android:id="@+id/commit_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_tiny"
tools:text="May 25, 2019" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider_color"
android:layout_gravity="bottom"/>
 
</RelativeLayout>
\ No newline at end of file
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/item_entry.xml
+ 49
− 44
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Card"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<RelativeLayout
android:id="@+id/list_item"
android:layout_height="wrap_content"
android:minHeight="72dp"
android:background="?attr/selectableItemBackground">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeight">
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical"
android:orientation="horizontal">
 
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/entry_image"
<ImageView
android:id="@+id/image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
tools:src="@drawable/ic_folder_24dp"
/>
tools:src="@drawable/ic_person_add_24dp"/>
 
<RelativeLayout
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:layout_toRightOf="@id/entry_image"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingTop="8dp"
>
<TextView
android:id="@+id/entry_title"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<com.devspark.robototextview.widget.RobotoTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_small"
tools:text="I commited all the code at once cause I am cool. So sorry"/>
android:layout_gravity="center_vertical"
app:typeface="roboto_medium"
android:textSize="16sp"
android:textColor="@color/white"
tools:text="Project"
/>
 
<TextView
android:id="@+id/entry_summary"
<com.devspark.robototextview.widget.RobotoTextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/entry_title"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_tiny"
tools:text="Jawnnypoo"/>
android:layout_gravity="center_vertical"
app:typeface="roboto_regular"
android:textSize="14sp"
tools:text="I like this project because its called a project and it has a really long description that should cut off after a few lines"
/>
</LinearLayout>
 
</RelativeLayout>
</LinearLayout>
 
</RelativeLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@color/divider_color"/>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/item_file.xml
+ 51
− 35
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground">
 
<ImageView
android:id="@+id/file_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
tools:src="@drawable/ic_folder_24dp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_gravity="center_vertical">
 
<TextView
android:id="@+id/file_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textSize="@dimen/text_size_small"
android:layout_toRightOf="@id/file_image"
android:layout_toLeftOf="@+id/file_more"
tools:text="build.gradle some really long file name that will overflow or something"
/>
<ImageView
android:id="@+id/file_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
tools:src="@drawable/ic_folder_24dp"
/>
 
<ImageView
android:id="@id/file_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_overflow_24dp"
android:padding="8dp"
android:layout_gravity="center_vertical"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:contentDescription="@null"/>
<TextView
android:id="@+id/file_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_gravity="center_vertical"
android:textSize="@dimen/text_size_small"
android:maxLines="2"
android:ellipsize="end"
tools:text="build.gradle some really long file name that will overflow or something"
/>
 
</RelativeLayout>
\ No newline at end of file
<ImageView
android:id="@+id/file_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_overflow_24dp"
android:padding="2dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@color/divider_color"/>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/item_issue.xml
+ 32
− 23
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:background="?attr/selectableItemBackground">
 
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/issue_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:contentDescription="@null"
tools:src="@drawable/ic_folder_24dp"
/>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/issue_image"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginRight="16dp"
>
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" >
 
<TextView
android:id="@+id/issue_message"
@@ -44,11 +36,28 @@
android:id="@+id/issue_creator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/issue_message"
android:textSize="@dimen/text_size_tiny"
android:textColor="?android:attr/textColorSecondary"
tools:text="Created 45 days ago by Jawnnypoo"/>
 
</RelativeLayout>
</LinearLayout>
<ImageView
android:id="@+id/issue_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_marginRight="8dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
tools:src="@drawable/ic_assign_24dp"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@color/divider_color"/>
 
</RelativeLayout>
\ No newline at end of file
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/item_member_project.xml
+ 1
− 1
View file @ e3c730d9
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="bottom"
android:background="@color/grey_60">
android:background="@color/main_blue_60">
 
<TextView
android:id="@+id/name"
app/src/main/res/layout/item_merge_request.xml
+ 49
− 45
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:background="?attr/selectableItemBackground">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/request_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:contentDescription="@null"
tools:src="@drawable/ic_assign_24dp"
/>
<RelativeLayout
android:background="?attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeight">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/request_image"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginRight="16dp"
>
<TextView
android:id="@+id/request_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_small"
android:textColor="?android:attr/textColorPrimary"
android:maxLines="2"
android:ellipsize="end"
tools:text="I commited all the code at once cause I am cool. So sorry"/>
<TextView
android:id="@+id/request_author"
android:layout_width="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/request_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:contentDescription="@null"
tools:src="@drawable/ic_assign_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/request_title"
android:textSize="@dimen/text_size_tiny"
android:textColor="?android:attr/textColorSecondary"
tools:text="Jawnnypoo"/>
android:orientation="vertical"
android:layout_margin="8dp">
<TextView
android:id="@+id/request_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_small"
tools:text="I commited all the code at once cause I am cool. So sorry" />
 
</RelativeLayout>
<TextView
android:id="@+id/request_author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_tiny"
tools:text="Jawnnypoo" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@color/divider_color" />
 
</RelativeLayout>
\ No newline at end of file
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/item_merge_request_comment.xml deleted 100644 → 0
+ 0
− 49
View file @ 28c09fb7
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/note_list_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:minHeight="?android:attr/listPreferredItemHeight"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher"
android:layout_marginLeft="@dimen/padding_normal"
android:layout_gravity="center_vertical"
android:contentDescription="@null"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/padding_normal"
android:layout_marginRight="@dimen/padding_normal"
android:orientation="vertical" >
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Username"
android:textStyle="italic"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorTertiary" />
<TextView
android:id="@+id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Comment"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_milestone.xml
+ 28
− 16
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?attr/selectableItemBackground"
android:padding="16dp">
android:minHeight="?android:attr/listPreferredItemHeight">
 
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textSize="16sp"
tools:text="milestone 100" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="16dp">
 
<TextView
android:id="@+id/due_date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:text="12/12/12" />
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textSize="16sp"
tools:text="milestone 100" />
 
</LinearLayout>
\ No newline at end of file
<TextView
android:id="@+id/due_date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:text="12/12/12" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@color/divider_color"/>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/item_note.xml
+ 1
− 1
View file @ e3c730d9
@@ -11,7 +11,7 @@
android:layout_marginBottom="8dp"
android:orientation="horizontal">
 
<de.hdodenhof.circleimageview.CircleImageView
<ImageView
android:id="@+id/icon"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
app/src/main/res/layout/item_project.xml
+ 54
− 38
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView
style="@style/Card"
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="4dp">
<ImageView
android:id="@+id/project_visibility"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_margin="4dp"
android:layout_gravity="right"
android:contentDescription="@null"
tools:src="@drawable/ic_public_24dp"/>
android:minHeight="72dp"
android:background="?attr/selectableItemBackground">
 
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:padding="8dp">
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical"
android:orientation="horizontal">
 
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/project_image"
<FrameLayout
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
tools:src="@mipmap/ic_launcher"/>
android:layout_gravity="center_vertical">
 
<com.github.ivbaranov.mli.MaterialLetterIcon
android:id="@+id/project_letter"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_gravity="center_vertical"/>
<ImageView
android:id="@+id/project_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
tools:src="@drawable/ic_person_add_24dp"/>
<com.github.ivbaranov.mli.MaterialLetterIcon
android:id="@+id/project_letter"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_gravity="center_vertical"/>
</FrameLayout>
 
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:orientation="vertical">
 
<TextView
<com.devspark.robototextview.widget.RobotoTextView
android:id="@+id/project_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:textSize="18sp"
app:typeface="roboto_medium"
android:textSize="16sp"
android:textColor="@color/white"
android:maxLines="2"
android:ellipsize="end"
tools:text="Project"
/>
 
<TextView
<com.devspark.robototextview.widget.RobotoTextView
android:id="@+id/project_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
app:typeface="roboto_regular"
android:textSize="14sp"
tools:text="Project"
android:maxLines="2"
android:ellipsize="end"
tools:text="I like this project because its called a project and it has a really long description that should cut off after a few lines"
/>
 
</LinearLayout>
 
<ImageView
android:id="@+id/project_visibility"
android:layout_width="16dp"
android:layout_height="16dp"
android:contentDescription="@null"
tools:src="@drawable/ic_public_24dp"/>
</LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@color/divider_color"/>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/item_user.xml
+ 1
− 1
View file @ e3c730d9
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/grey_60">
android:background="@color/main_blue_60">
 
<TextView
android:id="@+id/name"
app/src/main/res/layout/progress_fullscreen.xml
+ 1
− 1
View file @ e3c730d9
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/grey_60"
android:background="@color/scrim"
android:visibility="gone"
android:clickable="true"
app:matProg_barColor="?attr/colorAccent"
app/src/main/res/layout/view_send_message.xml 0 → 100644
+ 33
− 0
View file @ e3c730d9
<?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="wrap_content"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
android:minHeight="?attr/actionBarSize"
android:paddingTop="8dp"
android:orientation="horizontal">
<EditText
android:id="@+id/new_note_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_weight="1"
android:hint="@string/new_note_hint"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:maxLines="4" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/new_note_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:src="@drawable/ic_send_24dp"
app:fabSize="mini" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/mipmap-hdpi/ic_launcher.png
+ 0
− 0
View replaced file @ 28c09fb7 View file @ e3c730d9
app/src/main/res/mipmap-hdpi/ic_launcher.png

2.97 KiB | W: 72px | H: 72px

app/src/main/res/mipmap-hdpi/ic_launcher.png

2.81 KiB | W: 72px | H: 72px

app/src/main/res/mipmap-hdpi/ic_launcher.png
app/src/main/res/mipmap-hdpi/ic_launcher.png
app/src/main/res/mipmap-hdpi/ic_launcher.png
app/src/main/res/mipmap-hdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-mdpi/ic_launcher.png
+ 0
− 0
View replaced file @ 28c09fb7 View file @ e3c730d9
app/src/main/res/mipmap-mdpi/ic_launcher.png

2.06 KiB | W: 48px | H: 48px

app/src/main/res/mipmap-mdpi/ic_launcher.png

1.72 KiB | W: 48px | H: 48px

app/src/main/res/mipmap-mdpi/ic_launcher.png
app/src/main/res/mipmap-mdpi/ic_launcher.png
app/src/main/res/mipmap-mdpi/ic_launcher.png
app/src/main/res/mipmap-mdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xhdpi/ic_launcher.png
+ 0
− 0
View replaced file @ 28c09fb7 View file @ e3c730d9
app/src/main/res/mipmap-xhdpi/ic_launcher.png

4.49 KiB | W: 96px | H: 96px

app/src/main/res/mipmap-xhdpi/ic_launcher.png

3.96 KiB | W: 96px | H: 96px

app/src/main/res/mipmap-xhdpi/ic_launcher.png
app/src/main/res/mipmap-xhdpi/ic_launcher.png
app/src/main/res/mipmap-xhdpi/ic_launcher.png
app/src/main/res/mipmap-xhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+ 0
− 0
View replaced file @ 28c09fb7 View file @ e3c730d9
app/src/main/res/mipmap-xxhdpi/ic_launcher.png

7.07 KiB | W: 144px | H: 144px

app/src/main/res/mipmap-xxhdpi/ic_launcher.png

6.36 KiB | W: 144px | H: 144px

app/src/main/res/mipmap-xxhdpi/ic_launcher.png
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+ 0
− 0
View replaced file @ 28c09fb7 View file @ e3c730d9
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

8.75 KiB | W: 192px | H: 192px

app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

9.74 KiB | W: 192px | H: 192px

app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
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