Skip to content
Snippets Groups Projects
Commit 811d3429 authored by John Carlson's avatar John Carlson
Browse files

Fix bug in add user activity

parent ea2f3bc0
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -111,7 +111,7 @@ public class AddUserActivity extends MorphActivity {
return true;
}
 
@OnTextChanged
@OnTextChanged(R.id.search)
void onTextChanged(CharSequence s, int start, int before, int count) {
if (TextUtils.isEmpty(s)) {
buttonClear.animate()
Loading
Loading
Loading
Loading
@@ -68,7 +68,7 @@ public class BuildActivity extends BaseActivity {
Project project;
Build build;
 
private final Toolbar.OnMenuItemClickListener mOnMenuItemClickListener = new Toolbar.OnMenuItemClickListener() {
private final Toolbar.OnMenuItemClickListener onMenuItemClickListener = new Toolbar.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
Loading
Loading
@@ -174,7 +174,7 @@ public class BuildActivity extends BaseActivity {
});
toolbar.setSubtitle(project.getNameWithNamespace());
toolbar.inflateMenu(R.menu.menu_build);
toolbar.setOnMenuItemClickListener(mOnMenuItemClickListener);
toolbar.setOnMenuItemClickListener(onMenuItemClickListener);
menuItemDownload = toolbar.getMenu().findItem(R.id.action_download);
menuItemDownload.setVisible(build.getArtifactsFile() != null);
setupTabs();
Loading
Loading
Loading
Loading
@@ -234,7 +234,7 @@ public class Navigator {
 
public static void navigateToEditMilestone(Activity activity, View fab, Project project, Milestone milestone) {
Intent intent = AddMilestoneActivity.newIntent(activity, project.getId(), milestone);
startMorphActivity(activity, fab, R.drawable.ic_edit_24dp, intent);
activity.startActivity(intent);
}
 
public static void navigateToBuild(Activity activity, Project project, com.commit451.gitlab.model.api.Build build) {
Loading
Loading
Loading
Loading
@@ -141,7 +141,6 @@ public class FeedRemoteViewsFactory implements RemoteViewsService.RemoteViewsFac
if (feed.getEntries() != null) {
entries.addAll(feed.getEntries());
}
} catch (Exception e) {
//maybe let the user know somehow?
Timber.e(e);
Loading
Loading
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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"
Loading
Loading
@@ -19,7 +18,7 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"/>
android:layout_height="?attr/actionBarSize" />
 
</android.support.design.widget.AppBarLayout>
 
Loading
Loading
@@ -31,7 +30,7 @@
android:gravity="center"
android:padding="@dimen/padding_normal"
android:text="@string/contributors"
android:textSize="22sp"/>
android:textSize="22sp" />
 
<com.commit451.gitlab.view.PhysicsFlowLayout
android:id="@+id/physics_layout"
Loading
Loading
@@ -40,36 +39,39 @@
android:layout_weight="1"
app:fling="true"
app:gravityX="0"
app:gravityY="0"/>
app:gravityY="0" />
 
<LinearLayout
android:id="@+id/sauce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="?attr/selectableItemBackgroundBorderless"
android:orientation="horizontal">
android:layout_marginBottom="8dp"
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin">
 
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="8dp"
android:contentDescription="@null"
android:src="@drawable/ic_logo"/>
android:src="@drawable/ic_logo" />
 
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center"
android:padding="@dimen/activity_horizontal_margin"
android:text="@string/sauce"
android:textSize="22sp"/>
android:textSize="22sp" />
 
</LinearLayout>
 
</LinearLayout>
 
<include layout="@layout/progress"/>
<include layout="@layout/progress" />
 
</FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
Loading
Loading
@@ -25,18 +24,17 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
 
<TextView
android:id="@+id/message_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="16dp"
android:text="@string/widget_config_no_accounts"
android:gravity="center"
android:layout_gravity="center"
android:visibility="gone"/>
android:text="@string/widget_config_no_accounts"
android:visibility="gone" />
 
</FrameLayout>
 
Loading
Loading
Loading
Loading
@@ -21,6 +21,10 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
 
<!--Hack for the fact that if there is not a view here, then the fab will disappear-->
<View
android:layout_width="match_parent"
android:layout_height="0dp"/>
</android.support.design.widget.AppBarLayout>
 
<com.commit451.gitlab.view.LabCoatSwipeRefreshLayout
Loading
Loading
Loading
Loading
@@ -20,6 +20,7 @@
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
</android.support.design.widget.CoordinatorLayout>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
 
Loading
Loading
@@ -11,16 +10,17 @@
 
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:scrollbars="vertical">
 
<TextView
android:id="@+id/log"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"/>
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" />
 
</android.support.v4.widget.NestedScrollView>
 
Loading
Loading
@@ -34,6 +34,6 @@
android:layout_margin="16dp"
android:gravity="center"
android:text="@string/no_log_found"
android:visibility="gone"/>
android:visibility="gone" />
 
</FrameLayout>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment