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 233 additions and 230 deletions
app/src/main/res/drawable/ic_milestone_24dp.xml 0 → 100644
+ 9
− 0
View file @ e3c730d9
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
</vector>
app/src/main/res/layout/activity_add_issue.xml
+ 82
− 78
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:transitionName="@string/transition_morph"
>
android:transitionName="@string/transition_morph">
 
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
 
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
@@ -22,98 +20,104 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"/>
android:background="?attr/colorPrimary" />
 
</android.support.design.widget.AppBarLayout>
 
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">
android:layout_height="wrap_content">
 
<android.support.design.widget.TextInputLayout
android:id="@+id/title_text_input_layout"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">
 
<EditText
android:id="@+id/title"
<android.support.design.widget.TextInputLayout
android:id="@+id/title_text_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_title"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"/>
android:layout_height="wrap_content">
 
</android.support.design.widget.TextInputLayout>
<EditText
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_title"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine" />
 
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
</android.support.design.widget.TextInputLayout>
 
<EditText
android:id="@+id/description"
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_description"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"/>
android:layout_height="0dp"
android:layout_weight="1">
 
</android.support.design.widget.TextInputLayout>
<EditText
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_description"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine" />
 
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/assignee"/>
</android.support.design.widget.TextInputLayout>
 
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.pnikosis.materialishprogress.ProgressWheel
android:id="@+id/assignee_progress"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
app:matProg_barColor="?attr/colorAccent"
app:matProg_progressIndeterminate="true"/>
<Spinner
android:id="@+id/assignee_spinner"
android:layout_width="match_parent"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/milestone"/>
android:text="@string/assignee" />
 
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.pnikosis.materialishprogress.ProgressWheel
android:id="@+id/milestone_progress"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
app:matProg_barColor="?attr/colorAccent"
app:matProg_progressIndeterminate="true"/>
<Spinner
android:id="@+id/milestone_spinner"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.pnikosis.materialishprogress.ProgressWheel
android:id="@+id/assignee_progress"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
app:matProg_barColor="?attr/colorAccent"
app:matProg_progressIndeterminate="true" />
<Spinner
android:id="@+id/assignee_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
android:text="@string/milestone" />
 
</FrameLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp">
<com.pnikosis.materialishprogress.ProgressWheel
android:id="@+id/milestone_progress"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
app:matProg_barColor="?attr/colorAccent"
app:matProg_progressIndeterminate="true" />
<Spinner
android:id="@+id/milestone_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
</ScrollView>
 
</LinearLayout>
 
<include layout="@layout/progress_fullscreen"/>
<include layout="@layout/progress_fullscreen" />
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
app/src/main/res/layout/activity_add_milestone.xml
+ 41
− 34
View file @ e3c730d9
@@ -5,8 +5,8 @@
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:transitionName="@string/transition_morph"
android:orientation="vertical">
android:orientation="vertical"
android:transitionName="@string/transition_morph">
 
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
@@ -21,52 +21,59 @@
 
</android.support.design.widget.AppBarLayout>
 
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">
android:layout_height="wrap_content">
 
<android.support.design.widget.TextInputLayout
android:id="@+id/title_text_input_layout"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">
 
<EditText
android:id="@+id/title"
<android.support.design.widget.TextInputLayout
android:id="@+id/title_text_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone"
android:hint="@string/milestone_hint_title" />
android:layout_height="wrap_content">
 
</android.support.design.widget.TextInputLayout>
<EditText
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_title"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine" />
 
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
</android.support.design.widget.TextInputLayout>
 
<EditText
android:id="@+id/description"
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone"
android:hint="@string/milestone_hint_description" />
android:layout_height="0dp"
android:layout_weight="1">
 
</android.support.design.widget.TextInputLayout>
<EditText
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_description"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine" />
 
<Button
android:id="@+id/due_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/due_date" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/due_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/due_date"
android:layout_marginBottom="8dp"/>
 
</LinearLayout>
</LinearLayout>
</ScrollView>
 
</LinearLayout>
 
<include layout="@layout/progress_fullscreen" />
</merge>
\ No newline at end of file
app/src/main/res/layout/activity_group.xml
+ 0
− 1
View file @ e3c730d9
@@ -25,7 +25,6 @@
android:id="@+id/backdrop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/header"
android:fitsSystemWindows="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app/src/main/res/layout/activity_groups.xml
+ 0
− 1
View file @ e3c730d9
@@ -63,7 +63,6 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:clickable="true"
android:background="@color/window_background_color"
android:fitsSystemWindows="true"
/>
 
app/src/main/res/layout/activity_issue.xml
+ 1
− 29
View file @ e3c730d9
@@ -47,35 +47,7 @@
 
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:orientation="horizontal"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary" >
<EditText
android:id="@+id/new_note_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:hint="@string/new_note_hint"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone" />
<ImageView
android:id="@+id/new_note_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="16dp"
android:paddingLeft="16dp"
android:contentDescription="@null"
android:src="@drawable/ic_send_24dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
</LinearLayout>
<include layout="@layout/view_send_message"/>
 
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_edit_issue"
app/src/main/res/layout/activity_login.xml
+ 1
− 1
View file @ e3c730d9
@@ -5,7 +5,7 @@
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/purple">
android:background="?attr/colorPrimary">
 
<ImageView
android:layout_width="100dp"
app/src/main/res/layout/activity_merge_request.xml
+ 1
− 30
View file @ e3c730d9
@@ -46,36 +46,7 @@
 
</LinearLayout>
 
<LinearLayout
android:id="@+id/rel1"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:orientation="horizontal"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary" >
<EditText
android:id="@+id/new_note_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:hint="@string/new_note_hint"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone" />
<ImageView
android:id="@+id/new_note_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="16dp"
android:paddingLeft="16dp"
android:contentDescription="@null"
android:src="@drawable/ic_send_24dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
</LinearLayout>
<include layout="@layout/view_send_message"/>
 
<include layout="@layout/progress_fullscreen"/>
 
app/src/main/res/layout/activity_search.xml
+ 1
− 1
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_content_container"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
app/src/main/res/layout/fragment_commits.xml
+ 1
− 6
View file @ e3c730d9
@@ -13,12 +13,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false"
/>
android:layout_height="match_parent" />
 
</com.commit451.gitlab.view.GitLabSwipeRefreshLayout>
 
app/src/main/res/layout/fragment_feed.xml
+ 1
− 6
View file @ e3c730d9
@@ -13,12 +13,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false"
/>
android:layout_height="match_parent" />
 
</com.commit451.gitlab.view.GitLabSwipeRefreshLayout>
 
app/src/main/res/layout/fragment_files.xml
+ 3
− 2
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent" >
 
@@ -13,8 +14,8 @@
android:id="@+id/breadcrumb"
android:layout_width="match_parent"
android:layout_height="32dp"
android:paddingLeft="54dp"
android:paddingRight="54dp"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:clipToPadding="false"
android:clipChildren="false"
android:background="?attr/colorPrimary"/>
app/src/main/res/layout/fragment_issues.xml
+ 5
− 2
View file @ e3c730d9
@@ -21,12 +21,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
 
<!--
We set the padding bottom so that the FAB is not covered
It is the size of the FAB 56dp + 8dp padding
-->
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="88dp"
android:paddingBottom="64dp"
android:clipToPadding="false"
/>
 
app/src/main/res/layout/fragment_merge_request.xml
+ 0
− 4
View file @ e3c730d9
@@ -26,10 +26,6 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="8dp"
android:paddingTop="8dp"
/>
 
</com.commit451.gitlab.view.GitLabSwipeRefreshLayout>
app/src/main/res/layout/fragment_milestones.xml
+ 1
− 7
View file @ e3c730d9
@@ -17,7 +17,6 @@
android:layout_marginRight="16dp"
android:visibility="gone"/>
 
<com.commit451.gitlab.view.GitLabSwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
@@ -26,12 +25,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="8dp"
android:paddingTop="8dp"
/>
android:layout_height="match_parent" />
 
</com.commit451.gitlab.view.GitLabSwipeRefreshLayout>
 
app/src/main/res/layout/fragment_overview.xml
+ 50
− 12
View file @ e3c730d9
<?xml version="1.0" encoding="utf-8"?>
<com.commit451.gitlab.view.GitLabSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.commit451.gitlab.view.GitLabSwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
@@ -15,29 +15,67 @@
android:layout_height="wrap_content"
android:orientation="vertical">
 
<com.devspark.robototextview.widget.RobotoTextView
android:id="@+id/creator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:textSize="14sp"
android:background="?attr/selectableItemBackground"
tools:text="Created by Commit451"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="16dp">
 
<TextView
android:id="@+id/star_count"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_star_24dp"
android:drawablePadding="8dp"
tools:text="100" />
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star_24dp"
android:contentDescription="@null"/>
<TextView
android:id="@+id/star_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
tools:text="100" />
 
<TextView
android:id="@+id/forks_count"
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_fork_24dp"
android:drawablePadding="8dp"
tools:text="100" />
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_fork"
android:contentDescription="@null"/>
<TextView
android:id="@+id/forks_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
tools:text="100" />
</LinearLayout>
</LinearLayout>
 
<TextView
app/src/main/res/layout/fragment_users.xml
+ 1
− 5
View file @ e3c730d9
@@ -13,11 +13,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false"
/>
android:layout_height="match_parent" />
 
</com.commit451.gitlab.view.GitLabSwipeRefreshLayout>
 
app/src/main/res/layout/header_issue.xml
+ 28
− 1
View file @ e3c730d9
@@ -22,7 +22,7 @@
android:orientation="horizontal"
android:layout_margin="16dp">
 
<de.hdodenhof.circleimageview.CircleImageView
<ImageView
android:id="@+id/author_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
@@ -40,5 +40,32 @@
 
</LinearLayout>
 
<LinearLayout
android:id="@+id/milestone_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_milestone_24dp"
android:contentDescription="@null"/>
<TextView
android:id="@+id/milestone_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/padding_normal"
android:layout_marginRight="@dimen/padding_normal"
android:layout_gravity="center_vertical"
tools:text="2.0.0"/>
</LinearLayout>
 
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/header_merge_request.xml
+ 1
− 1
View file @ e3c730d9
@@ -22,7 +22,7 @@
android:orientation="horizontal"
android:layout_margin="16dp">
 
<de.hdodenhof.circleimageview.CircleImageView
<ImageView
android:id="@+id/author_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
app/src/main/res/layout/header_nav_drawer.xml
+ 6
− 9
View file @ e3c730d9
@@ -14,9 +14,9 @@
android:fitsSystemWindows="false"
android:scaleType="fitXY"
android:src="@drawable/header"
android:background="#D7C1E5"/>
android:background="@color/background_color"/>
 
<de.hdodenhof.circleimageview.CircleImageView
<com.commit451.foregroundimageview.ForegroundImageView
android:id="@+id/profile_image"
android:layout_width="@dimen/larger_image_size"
android:layout_height="@dimen/larger_image_size"
@@ -24,6 +24,7 @@
android:layout_marginRight="16dp"
android:layout_marginTop="32dp"
android:fitsSystemWindows="true"
android:foreground="?attr/selectableItemBackgroundBorderless"
tools:src="@drawable/ic_assign_24dp"/>
 
<FrameLayout
@@ -45,7 +46,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="14sp"
app:typeface="roboto_medium"
tools:text="Jawnnypew"/>
@@ -56,7 +57,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="poop123@aol.com"/>
</LinearLayout>
@@ -67,8 +68,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:contentDescription="@null"
android:src="@drawable/ic_arrow_down_24dp"
android:tint="@color/window_background_color"/>
android:src="@drawable/ic_arrow_down_24dp" />
</FrameLayout>
 
 
@@ -76,9 +76,6 @@
android:id="@+id/account_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:visibility="gone"
/>
 
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