Skip to content
Snippets Groups Projects
Commit 964eddd7 authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Add more and more dividers.

parent e7af5fa6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 116 additions and 103 deletions
app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.java
+ 22
− 3
View file @ 964eddd7
@@ -91,7 +91,12 @@ public class ProjectActivity extends BaseActivity {
@Override
public void onFailure(Throwable t) {
Timber.e(t, null);
mProgress.setVisibility(View.GONE);
mProgress.animate().alpha(0.0f).withEndAction(new Runnable() {
@Override
public void run() {
mProgress.setVisibility(View.GONE);
}
});
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
@@ -104,7 +109,12 @@ public class ProjectActivity extends BaseActivity {
if (!response.isSuccess()) {
return;
}
mProgress.setVisibility(View.GONE);
mProgress.animate().alpha(0.0f).withEndAction(new Runnable() {
@Override
public void run() {
mProgress.setVisibility(View.GONE);
}
});
 
if(response.body().isEmpty()) {
mBranchSpinner.setVisibility(View.GONE);
@@ -131,7 +141,12 @@ public class ProjectActivity extends BaseActivity {
@Override
public void onFailure(Throwable t) {
Timber.e(t, null);
mProgress.setVisibility(View.GONE);
mProgress.animate().alpha(0.0f).withEndAction(new Runnable() {
@Override
public void run() {
mProgress.setVisibility(View.GONE);
}
});
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
@@ -176,12 +191,16 @@ public class ProjectActivity extends BaseActivity {
}
 
private void loadProject(long projectId) {
mProgress.setAlpha(0.0f);
mProgress.setVisibility(View.VISIBLE);
mProgress.animate().alpha(1.0f);
GitLabClient.instance().getProject(projectId).enqueue(mProjectCallback);
}
 
private void loadBranches() {
mProgress.setAlpha(0.0f);
mProgress.setVisibility(View.VISIBLE);
mProgress.animate().alpha(1.0f);
GitLabClient.instance().getBranches(mProject.getId()).enqueue(mBranchesCallback);
}
 
app/src/main/java/com/commit451/gitlab/adapter/FeedAdapter.java
+ 0
− 1
View file @ 964eddd7
@@ -13,7 +13,6 @@ import java.util.Collection;
 
/**
* Adapts the feeds
* Created by John on 10/8/15.
*/
public class FeedAdapter extends RecyclerView.Adapter<FeedEntryViewHolder> {
 
app/src/main/res/layout/fragment_commits.xml
+ 1
− 6
View file @ 964eddd7
@@ -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 @ 964eddd7
@@ -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_issues.xml
+ 5
− 2
View file @ 964eddd7
@@ -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 + 16dp 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="72dp"
android:clipToPadding="false"
/>
 
app/src/main/res/layout/fragment_merge_request.xml
+ 0
− 4
View file @ 964eddd7
@@ -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 @ 964eddd7
@@ -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_users.xml
+ 1
− 5
View file @ 964eddd7
@@ -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_nav_drawer.xml
+ 0
− 3
View file @ 964eddd7
@@ -75,9 +75,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"
/>
 
app/src/main/res/layout/item_commit.xml
+ 57
− 50
View file @ 964eddd7
<?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">
 
<ImageView
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_star_24dp"
/>
<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_milestone.xml
+ 28
− 16
View file @ 964eddd7
<?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
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