Skip to content
Snippets Groups Projects
Commit 22e1ddd3 authored by Jawn's avatar Jawn
Browse files

Convert all Croutons to snackbars, begin work on new nav drawer layout.

parent ba9301f1
No related branches found
No related tags found
No related merge requests found
Showing
with 294 additions and 116 deletions
Loading
Loading
@@ -41,7 +41,8 @@ dependencies {
compile 'com.squareup.okhttp:okhttp:2.4.0'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.jakewharton.timber:timber:3.1.0'
compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar'
compile 'de.hdodenhof:circleimageview:1.3.0'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
compile 'com.android.support:recyclerview-v7:22.2.1'
}
package com.commit451.gitlab;
 
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
Loading
Loading
@@ -17,8 +18,6 @@ import java.util.List;
 
import butterknife.Bind;
import butterknife.ButterKnife;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -37,12 +36,6 @@ public class DiffActivity extends BaseActivity {
init();
}
@Override
public void onDestroy() {
super.onDestroy();
Crouton.cancelAllCroutons();
}
private void init() {
toolbar.setNavigationIcon(R.drawable.ic_back);
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
Loading
Loading
@@ -82,8 +75,8 @@ public class DiffActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(DiffActivity.this, e);
Crouton.makeText(DiffActivity.this, R.string.connection_error, Style.ALERT);
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -99,8 +92,8 @@ public class DiffActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(DiffActivity.this, e);
Crouton.makeText(DiffActivity.this, R.string.connection_error, Style.ALERT);
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
Loading
Loading
@@ -5,6 +5,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
Loading
Loading
@@ -18,15 +19,12 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
 
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
 
import butterknife.Bind;
import butterknife.ButterKnife;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -50,13 +48,6 @@ public class FileActivity extends BaseActivity {
}
}
@Override
public void onDestroy() {
super.onDestroy();
Crouton.cancelAllCroutons();
}
@SuppressLint("SetJavaScriptEnabled")
private void setupUI() {
toolbar.setNavigationIcon(R.drawable.ic_back);
Loading
Loading
@@ -67,14 +58,10 @@ public class FileActivity extends BaseActivity {
}
});
toolbar.setTitle(Repository.selectedFile.getName());
toolbar.inflateMenu(R.menu.file);
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.action_open:
openFile();
return true;
Loading
Loading
@@ -115,7 +102,8 @@ public class FileActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(FileActivity.this, e);
Crouton.makeText(FileActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -134,20 +122,21 @@ public class FileActivity extends BaseActivity {
FileOutputStream f = new FileOutputStream(newFile);
f.write(fileBlob);
f.close();
Crouton.makeText(this, R.string.file_saved, Style.CONFIRM).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.file_saved), Snackbar.LENGTH_SHORT)
.show();
return newFile;
}
catch(FileNotFoundException e) {
Crouton.makeText(this, R.string.save_error, Style.ALERT).show();
}
catch(IOException e) {
Crouton.makeText(this, R.string.save_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.save_error), Snackbar.LENGTH_SHORT)
.show();
}
}
else
Crouton.makeText(this, R.string.save_error, Style.ALERT).show();
else {
Snackbar.make(getWindow().getDecorView(), getString(R.string.save_error), Snackbar.LENGTH_SHORT)
.show();
}
return null;
}
Loading
Loading
@@ -156,7 +145,8 @@ public class FileActivity extends BaseActivity {
File file = saveBlob();
if(file == null) {
Crouton.makeText(this, R.string.open_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.open_error), Snackbar.LENGTH_SHORT)
.show();
return;
}
 
Loading
Loading
@@ -165,7 +155,8 @@ public class FileActivity extends BaseActivity {
 
String fileExt = fileExt(file.toString());
if (fileExt == null) {
Crouton.makeText(this, R.string.open_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.open_error), Snackbar.LENGTH_SHORT)
.show();
return;
}
String mimeType = myMime.getMimeTypeFromExtension(fileExt.substring(1));
Loading
Loading
@@ -176,7 +167,8 @@ public class FileActivity extends BaseActivity {
startActivity(newIntent);
}
catch(android.content.ActivityNotFoundException e) {
Crouton.makeText(this, R.string.open_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.open_error), Snackbar.LENGTH_SHORT)
.show();
}
}
Loading
Loading
Loading
Loading
@@ -2,6 +2,7 @@ package com.commit451.gitlab;
 
import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.Toolbar;
import android.text.method.LinkMovementMethod;
import android.view.MenuItem;
Loading
Loading
@@ -31,8 +32,6 @@ import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import in.uncod.android.bypass.Bypass;
import retrofit.Callback;
import retrofit.RetrofitError;
Loading
Loading
@@ -70,13 +69,6 @@ public class IssueActivity extends BaseActivity {
}
}
@Override
public void onDestroy() {
super.onDestroy();
Crouton.cancelAllCroutons();
}
/**
* Set up the {@link android.app.ActionBar}.
*/
Loading
Loading
@@ -178,7 +170,8 @@ public class IssueActivity extends BaseActivity {
RetrofitHelper.printDebugInfo(IssueActivity.this, e);
progressBar.setVisibility(View.GONE);
Crouton.makeText(IssueActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -225,8 +218,9 @@ public class IssueActivity extends BaseActivity {
if(pd != null && pd.isShowing())
pd.cancel();
Crouton.makeText(IssueActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -265,8 +259,8 @@ public class IssueActivity extends BaseActivity {
if(pd != null && pd.isShowing())
pd.cancel();
Crouton.makeText(IssueActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -286,7 +280,8 @@ public class IssueActivity extends BaseActivity {
RetrofitHelper.printDebugInfo(IssueActivity.this, e);
progressBar.setVisibility(View.GONE);
Crouton.makeText(IssueActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -306,7 +301,8 @@ public class IssueActivity extends BaseActivity {
RetrofitHelper.printDebugInfo(IssueActivity.this, e);
progressBar.setVisibility(View.GONE);
Crouton.makeText(IssueActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
}
Loading
Loading
@@ -6,6 +6,7 @@ import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.text.method.LinkMovementMethod;
import android.view.KeyEvent;
import android.view.View;
Loading
Loading
@@ -23,8 +24,6 @@ import javax.net.ssl.SSLHandshakeException;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -57,13 +56,6 @@ public class LoginActivity extends BaseActivity {
tokenInput.setOnEditorActionListener(onEditorActionListener);
}
@Override
public void onDestroy() {
super.onDestroy();
Crouton.cancelAllCroutons();
}
@OnClick(R.id.show_normal_link)
public void showNormalLogin() {
if (normalLogin.getVisibility() == View.VISIBLE) {
Loading
Loading
@@ -84,7 +76,8 @@ public class LoginActivity extends BaseActivity {
String url = urlInput.getText().toString();
if(url.length() == 0) {
Crouton.makeText(LoginActivity.this, R.string.login_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.login_error), Snackbar.LENGTH_SHORT)
.show();
return;
}
else if(url.startsWith("http://") && url.endsWith(".git"))
Loading
Loading
@@ -216,7 +209,9 @@ public class LoginActivity extends BaseActivity {
urlInput.setText(urlInput.getText().toString().replace("http://", "https://"));
connect(auth);
}
else
Crouton.makeText(LoginActivity.this, R.string.login_error, Style.ALERT).show();
else {
Snackbar.make(getWindow().getDecorView(), getString(R.string.login_error), Snackbar.LENGTH_SHORT)
.show();
}
}
}
Loading
Loading
@@ -4,6 +4,7 @@ import android.app.ProgressDialog;
import android.content.Intent;
import android.graphics.Point;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
Loading
Loading
@@ -35,6 +36,7 @@ import com.commit451.gitlab.model.Project;
import com.commit451.gitlab.model.User;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.commit451.gitlab.views.GitLabNavigationView;
 
import java.lang.reflect.Field;
import java.util.ArrayList;
Loading
Loading
@@ -43,8 +45,6 @@ import java.util.Locale;
 
import butterknife.Bind;
import butterknife.ButterKnife;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -55,6 +55,7 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
@Bind(R.id.tabs) TabLayout tabs;
@Bind(R.id.branch_spinner) Spinner branchSpinner;
@Bind(R.id.drawer_layout) DrawerLayout drawerLayout;
@Bind(R.id.navigation_view) GitLabNavigationView navigationView;
@Bind(R.id.left_drawer) LinearLayout drawerLeft;
@Bind(R.id.left_drawer_list) ListView drawerList;
@Bind(R.id.pager) ViewPager viewPager;
Loading
Loading
@@ -135,12 +136,6 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
tabs.setupWithViewPager(viewPager);
}
@Override
public void onDestroy() {
super.onDestroy();
Crouton.cancelAllCroutons();
}
@Override
public boolean onNavigationItemSelected(int itemPosition, long itemId) {
Repository.selectedBranch = Repository.branches.get(itemPosition);
Loading
Loading
@@ -299,7 +294,7 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
@Override
public void success(List<User> users, Response resp) {
Repository.users = new ArrayList<User>(users);
Repository.users = new ArrayList<>(users);
Repository.getService().getProjects(projectsCallback);
}
Loading
Loading
@@ -310,8 +305,9 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
if(pd != null && pd.isShowing())
pd.cancel();
Crouton.makeText(MainActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -342,9 +338,12 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
if(Repository.selectedProject != null)
Repository.getService().getBranches(Repository.selectedProject.getId(), branchesCallback);
else
if(pd != null && pd.isShowing())
pd.cancel();
else {
if (pd != null && pd.isShowing()) {
pd.cancel();
}
}
navigationView.setProjects(projects);
}
@Override
Loading
Loading
@@ -353,8 +352,8 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
 
if(pd != null && pd.isShowing())
pd.cancel();
Crouton.makeText(MainActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
Loading
Loading
@@ -404,7 +403,8 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
}
 
RetrofitHelper.printDebugInfo(MainActivity.this, e);
Crouton.makeText(MainActivity.this, R.string.connection_error, Style.ALERT).show();
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
}
package com.commit451.gitlab.adapter;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.Project;
import com.commit451.gitlab.viewHolders.ProjectViewHolder;
import java.util.List;
/**
* Created by Jawn on 7/28/2015.
*/
public class ProjectsAdapter extends RecyclerView.Adapter<ProjectViewHolder> {
private List<Project> mValues;
public Project getValueAt(int position) {
return mValues.get(position);
}
public ProjectsAdapter(List<Project> items) {
mValues = items;
}
private final View.OnClickListener onProjectClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
//do the things
}
};
@Override
public ProjectViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
ProjectViewHolder holder = ProjectViewHolder.create(parent);
holder.itemView.setOnClickListener(onProjectClickListener);
return holder;
}
@Override
public void onBindViewHolder(final ProjectViewHolder holder, int position) {
Project project = getValueAt(position);
holder.bind(project);
holder.itemView.setTag(R.id.list_position, position);
}
@Override
public int getItemCount() {
return mValues.size();
}
}
Loading
Loading
@@ -3,6 +3,7 @@ package com.commit451.gitlab.fragments;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
Loading
Loading
@@ -18,8 +19,6 @@ import com.commit451.gitlab.tools.RetrofitHelper;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -63,8 +62,10 @@ public class AddIssueDialogFragment extends DialogFragment {
Repository.getService().postIssue(Repository.selectedProject.getId(), titleInput.getText().toString().trim(), descriptionInput.getText().toString().trim(), "", issueCallback);
}
else
Crouton.makeText(AddIssueDialogFragment.this.getActivity(), R.string.input_error, Style.ALERT, (ViewGroup) getView()).show();
else {
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.input_error), Snackbar.LENGTH_SHORT)
.show();
}
}
@OnClick(R.id.cancel_button)
Loading
Loading
@@ -96,8 +97,8 @@ public class AddIssueDialogFragment extends DialogFragment {
if(pd != null && pd.isShowing())
pd.cancel();
Crouton.makeText(AddIssueDialogFragment.this.getActivity(), R.string.connection_error, Style.ALERT).show();
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
}
Loading
Loading
@@ -2,6 +2,7 @@ package com.commit451.gitlab.fragments;
 
import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
Loading
Loading
@@ -18,8 +19,6 @@ import com.commit451.gitlab.tools.RetrofitHelper;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -84,8 +83,10 @@ public class AddUserDialogFragment extends DialogFragment {
if(user.getId() != 0)
Repository.userAdapter.addUser(user);
else
Crouton.makeText(AddUserDialogFragment.this.getActivity(), R.string.user_error, Style.ALERT).show();
else {
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.user_error), Snackbar.LENGTH_SHORT)
.show();
}
AddUserDialogFragment.this.dismiss();
}
Loading
Loading
@@ -96,8 +97,8 @@ public class AddUserDialogFragment extends DialogFragment {
if(pd != null && pd.isShowing())
pd.cancel();
Crouton.makeText(AddUserDialogFragment.this.getActivity(), R.string.user_error, Style.ALERT).show();
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.user_error), Snackbar.LENGTH_SHORT)
.show();
AddUserDialogFragment.this.dismiss();
}
};
Loading
Loading
Loading
Loading
@@ -2,6 +2,7 @@ package com.commit451.gitlab.fragments;
 
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
Loading
Loading
@@ -23,8 +24,6 @@ import java.util.List;
 
import butterknife.Bind;
import butterknife.ButterKnife;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -103,7 +102,8 @@ public class CommitsFragment extends Fragment implements SwipeRefreshLayout.OnRe
if(swipeLayout != null && swipeLayout.isRefreshing())
swipeLayout.setRefreshing(false);
 
Crouton.makeText(getActivity(), R.string.connection_error_commits, Style.ALERT).show();
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.connection_error_commits), Snackbar.LENGTH_SHORT)
.show();
listView.setAdapter(null);
}
};
Loading
Loading
Loading
Loading
@@ -2,6 +2,7 @@ package com.commit451.gitlab.fragments;
 
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
Loading
Loading
@@ -24,8 +25,6 @@ import java.util.List;
 
import butterknife.Bind;
import butterknife.ButterKnife;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -117,7 +116,8 @@ public class FilesFragment extends Fragment implements OnItemClickListener, Swip
if(e.getResponse().getStatus() != 500) {
RetrofitHelper.printDebugInfo(getActivity(), e);
Crouton.makeText(getActivity(), R.string.connection_error_files, Style.ALERT).show();
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.connection_error_files), Snackbar.LENGTH_SHORT)
.show();
}
}
}
Loading
Loading
Loading
Loading
@@ -2,6 +2,7 @@ package com.commit451.gitlab.fragments;
 
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
Loading
Loading
@@ -25,8 +26,6 @@ import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -93,8 +92,8 @@ public class IssuesFragment extends Fragment implements OnItemClickListener, Swi
if(swipeLayout != null && swipeLayout.isRefreshing())
swipeLayout.setRefreshing(false);
Crouton.makeText(getActivity(), R.string.connection_error_issues, Style.ALERT).show();
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.connection_error_issues), Snackbar.LENGTH_SHORT)
.show();
listView.setAdapter(null);
}
};
Loading
Loading
Loading
Loading
@@ -2,6 +2,7 @@ package com.commit451.gitlab.fragments;
 
import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
Loading
Loading
@@ -14,8 +15,6 @@ import com.commit451.gitlab.tools.RetrofitHelper;
 
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -67,8 +66,10 @@ public class RemoveUserDialogFragment extends DialogFragment {
if(response.getUserId() != 0) {
Repository.userAdapter.removeUser(response.getUserId());
}
else
Crouton.makeText(RemoveUserDialogFragment.this.getActivity(), R.string.user_remove_error, Style.ALERT).show();
else {
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.user_remove_error), Snackbar.LENGTH_SHORT)
.show();
}
RemoveUserDialogFragment.this.dismiss();
}
Loading
Loading
@@ -79,8 +80,8 @@ public class RemoveUserDialogFragment extends DialogFragment {
if(pd != null && pd.isShowing())
pd.cancel();
Crouton.makeText(RemoveUserDialogFragment.this.getActivity(), R.string.user_remove_error, Style.ALERT).show();
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.user_remove_error), Snackbar.LENGTH_SHORT)
.show();
RemoveUserDialogFragment.this.dismiss();
}
};
Loading
Loading
package com.commit451.gitlab.fragments;
 
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
Loading
Loading
@@ -24,8 +25,6 @@ import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -116,7 +115,8 @@ public class UsersFragment extends Fragment implements OnItemClickListener, Swip
addUserButton.setVisibility(View.VISIBLE);
 
RetrofitHelper.printDebugInfo(getActivity(), e);
Crouton.makeText(getActivity(), R.string.connection_error_users, Style.ALERT).show();
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.connection_error_users), Snackbar.LENGTH_SHORT)
.show();
listView.setAdapter(null);
}
}
Loading
Loading
package com.commit451.gitlab.viewHolders;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.Project;
import com.commit451.gitlab.tools.Repository;
import butterknife.Bind;
import butterknife.ButterKnife;
/**
* Projects, yay!
* Created by Jawn on 6/11/2015.
*/
public class ProjectViewHolder extends RecyclerView.ViewHolder {
public static ProjectViewHolder create(ViewGroup parent) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.item_project, parent, false);
return new ProjectViewHolder(view);
}
@Bind(R.id.project_title)
TextView title;
public ProjectViewHolder(View view) {
super(view);
ButterKnife.bind(this, view);
}
public void bind(Project project) {
title.setText(project.getName());
if (project.equals(Repository.selectedProject)) {
itemView.setSelected(true);
title.setTextColor(itemView.getResources().getColor(R.color.orange));
} else {
itemView.setSelected(false);
title.setTextColor(itemView.getResources().getColor(R.color.material_blue_grey_800));
}
}
}
package com.commit451.gitlab.views;
import android.annotation.TargetApi;
import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet;
import android.widget.FrameLayout;
import com.commit451.gitlab.R;
import com.commit451.gitlab.adapter.ProjectsAdapter;
import com.commit451.gitlab.model.Project;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
/**
* Our very own navigation view
* Created by Jawn on 7/28/2015.
*/
public class GitLabNavigationView extends FrameLayout{
@Bind(R.id.list) RecyclerView projectList;
public GitLabNavigationView(Context context) {
super(context);
init();
}
public GitLabNavigationView(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public GitLabNavigationView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
@TargetApi(21)
public GitLabNavigationView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() {
inflate(getContext(), R.layout.nav_drawer, this);
ButterKnife.bind(this);
projectList.setLayoutManager(new LinearLayoutManager(getContext()));
}
public void setProjects(List<Project> projects) {
projectList.setAdapter(new ProjectsAdapter(projects));
}
}
app/src/main/res/drawable-nodpi/header_image.png

9.43 KiB

Loading
Loading
@@ -52,7 +52,7 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:orientation="vertical"
android:background="@android:color/white">
android:background="?android:attr/colorForegroundInverse">
 
<ListView
android:id="@+id/left_drawer_list"
Loading
Loading
@@ -61,6 +61,11 @@
android:choiceMode="singleChoice"
android:dividerHeight="1dp" />
 
<com.commit451.gitlab.views.GitLabNavigationView
android:id="@+id/navigation_view"
android:layout_width="300dp"
android:layout_height="match_parent"/>
</LinearLayout>
 
</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackground">
<TextView
android:id="@+id/project_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_large"
android:padding="@dimen/padding_normal"/>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/header_image"
android:tint="?attr/colorPrimary"
android:background="?attr/colorAccent"
android:contentDescription="@null"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
\ 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