Skip to content
Snippets Groups Projects
Commit 184a0c68 authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Parcelabler things. Remove things. Fix things. Make things better.

parent 8c945cbb
No related branches found
No related tags found
No related merge requests found
Showing
with 97 additions and 61 deletions
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
 
android {
compileSdkVersion 22
Loading
Loading
@@ -6,7 +7,7 @@ android {
 
defaultConfig {
applicationId "com.commit451.gitlab"
minSdkVersion 15
minSdkVersion 16
targetSdkVersion 22
versionCode 100
versionName "1.0.0"
Loading
Loading
@@ -47,4 +48,6 @@ dependencies {
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'
compile "org.parceler:parceler-api:1.0.3"
apt "org.parceler:parceler:1.0.3"
}
Loading
Loading
@@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
 
<application
android:name="com.commit451.gitlab.GitLabApp"
Loading
Loading
Loading
Loading
@@ -11,7 +11,6 @@ import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.model.Diff;
import com.commit451.gitlab.model.DiffLine;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.commit451.gitlab.views.DiffView;
import com.commit451.gitlab.views.MessageView;
 
Loading
Loading
@@ -22,6 +21,7 @@ import butterknife.ButterKnife;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class DiffActivity extends BaseActivity {
 
Loading
Loading
@@ -76,7 +76,7 @@ public class DiffActivity extends BaseActivity {
 
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(DiffActivity.this, e);
Timber.e(e.toString());
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
Loading
Loading
@@ -93,7 +93,7 @@ public class DiffActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(DiffActivity.this, e);
Timber.e(e.toString());
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
Loading
Loading
Loading
Loading
@@ -14,7 +14,6 @@ import android.webkit.WebView;
 
import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
 
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
Loading
Loading
@@ -29,6 +28,7 @@ import butterknife.ButterKnife;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class FileActivity extends BaseActivity {
@Bind(R.id.toolbar) Toolbar toolbar;
Loading
Loading
@@ -102,7 +102,7 @@ public class FileActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(FileActivity.this, e);
Timber.e(e.toString());
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
Loading
Loading
package com.commit451.gitlab;
 
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.widget.SwipeRefreshLayout;
Loading
Loading
@@ -19,6 +21,8 @@ import com.commit451.gitlab.model.Note;
import com.commit451.gitlab.model.User;
import com.commit451.gitlab.tools.Repository;
 
import org.parceler.Parcels;
import java.util.List;
 
import butterknife.Bind;
Loading
Loading
@@ -31,6 +35,14 @@ import timber.log.Timber;
 
public class IssueActivity extends BaseActivity {
 
private static final String EXTRA_SELECTED_ISSUE = "extra_selected_issue";
public static Intent newInstance(Context context, Issue issue) {
Intent intent = new Intent(context, IssueActivity.class);
intent.putExtra(EXTRA_SELECTED_ISSUE, Parcels.wrap(issue));
return intent;
}
@Bind(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.swipe_layout) SwipeRefreshLayout swipeRefreshLayout;
Loading
Loading
@@ -48,6 +60,8 @@ public class IssueActivity extends BaseActivity {
setContentView(R.layout.activity_issue);
ButterKnife.bind(this);
 
Issue issue = Parcels.unwrap(getIntent().getParcelableExtra(EXTRA_SELECTED_ISSUE));
Timber.d("Issue " + issue.getDescription());
 
long tempId = Repository.selectedIssue.getIid();
if(tempId < 1) {
Loading
Loading
Loading
Loading
@@ -16,7 +16,6 @@ import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.model.Project;
import com.commit451.gitlab.model.Session;
import com.commit451.gitlab.tools.Prefs;
import com.commit451.gitlab.tools.RetrofitHelper;
 
import java.util.List;
 
Loading
Loading
@@ -28,6 +27,7 @@ import butterknife.OnClick;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class LoginActivity extends BaseActivity {
Loading
Loading
@@ -148,7 +148,7 @@ public class LoginActivity extends BaseActivity {
pd.cancel();
Prefs.setLoggedIn(LoginActivity.this, true);
Prefs.setPrivateToken(LoginActivity.this, session.private_token);
Prefs.setPrivateToken(LoginActivity.this, session.getPrivateToken());
Intent i = new Intent(LoginActivity.this, MainActivity.class);
i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Loading
Loading
@@ -187,7 +187,7 @@ public class LoginActivity extends BaseActivity {
};
 
private void handleConnectionError(RetrofitError e, boolean auth) {
RetrofitHelper.printDebugInfo(null, e);
Timber.e(e.toString());
 
if(pd != null && pd.isShowing())
pd.cancel();
Loading
Loading
Loading
Loading
@@ -34,7 +34,6 @@ import com.commit451.gitlab.model.Project;
import com.commit451.gitlab.model.User;
import com.commit451.gitlab.tools.Prefs;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.commit451.gitlab.views.GitLabNavigationView;
import com.squareup.otto.Subscribe;
 
Loading
Loading
@@ -48,6 +47,7 @@ import butterknife.ButterKnife;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class MainActivity extends BaseActivity {
 
Loading
Loading
@@ -266,7 +266,7 @@ public class MainActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(MainActivity.this, e);
Timber.e(e.toString());
GitLabClient.instance().getUsers(usersCallback);
}
};
Loading
Loading
@@ -282,7 +282,7 @@ public class MainActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(MainActivity.this, e);
Timber.e(e.toString());
if(pd != null && pd.isShowing())
pd.cancel();
Loading
Loading
@@ -326,7 +326,7 @@ public class MainActivity extends BaseActivity {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(MainActivity.this, e);
Timber.e(e.toString());
 
if(pd != null && pd.isShowing())
pd.cancel();
Loading
Loading
@@ -380,7 +380,7 @@ public class MainActivity extends BaseActivity {
return;
}
 
RetrofitHelper.printDebugInfo(MainActivity.this, e);
Timber.e(e.toString());
Snackbar.make(getWindow().getDecorView(), getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
Loading
Loading
package com.commit451.gitlab.adapter;
 
import android.content.Intent;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
Loading
Loading
@@ -33,7 +32,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<IssueViewHolder> {
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
Repository.selectedIssue = getValueAt(position);
v.getContext().startActivity(new Intent(v.getContext(), IssueActivity.class));
v.getContext().startActivity(IssueActivity.newInstance(v.getContext(), getValueAt(position)));
}
};
 
Loading
Loading
Loading
Loading
@@ -48,7 +48,7 @@ public class MilestonesAdapter extends BaseAdapter {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
if(convertView == null) convertView = inflater.inflate(R.layout.twoline_list_item, parent, false);
if(convertView == null) convertView = inflater.inflate(R.layout.item_milestone, parent, false);
 
final TextView title = (TextView) convertView.findViewById(R.id.title);
final TextView summary = (TextView) convertView.findViewById(R.id.summary);
Loading
Loading
Loading
Loading
@@ -15,7 +15,6 @@ import com.commit451.gitlab.R;
import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.model.Issue;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
 
import butterknife.Bind;
import butterknife.ButterKnife;
Loading
Loading
@@ -23,6 +22,7 @@ import butterknife.OnClick;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class AddIssueDialogFragment extends DialogFragment {
Loading
Loading
@@ -90,7 +90,7 @@ public class AddIssueDialogFragment extends DialogFragment {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(getActivity(), e);
Timber.e(e.toString());
if(pd != null && pd.isShowing()) {
pd.cancel();
Loading
Loading
Loading
Loading
@@ -15,7 +15,6 @@ import com.commit451.gitlab.adapter.UserAdapter;
import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.model.User;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
 
import butterknife.Bind;
import butterknife.ButterKnife;
Loading
Loading
@@ -23,6 +22,7 @@ import butterknife.OnClick;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class AddUserDialogFragment extends DialogFragment {
Loading
Loading
@@ -95,7 +95,7 @@ public class AddUserDialogFragment extends DialogFragment {
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(getActivity(), e);
Timber.e(e.toString());
if(pd != null && pd.isShowing())
pd.cancel();
Loading
Loading
Loading
Loading
@@ -15,7 +15,6 @@ import com.commit451.gitlab.adapter.CommitsAdapter;
import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.model.DiffLine;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
 
import java.util.List;
 
Loading
Loading
@@ -108,7 +107,7 @@ public class CommitsFragment extends Fragment implements SwipeRefreshLayout.OnRe
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(getActivity(), e);
Timber.e(e.toString());
 
if(swipeLayout != null && swipeLayout.isRefreshing()) {
swipeLayout.setRefreshing(false);
Loading
Loading
Loading
Loading
@@ -15,13 +15,10 @@ import android.widget.TextView;
import com.commit451.gitlab.FileActivity;
import com.commit451.gitlab.GitLabApp;
import com.commit451.gitlab.R;
import com.commit451.gitlab.api.GitLab;
import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.events.CloseDrawerEvent;
import com.commit451.gitlab.events.ProjectChangedEvent;
import com.commit451.gitlab.model.TreeItem;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.commit451.gitlab.viewHolders.FileViewHolder;
import com.squareup.otto.Subscribe;
 
Loading
Loading
@@ -133,7 +130,7 @@ public class FilesFragment extends Fragment implements SwipeRefreshLayout.OnRefr
list.setAdapter(null);
if(e.getResponse() != null && e.getResponse().getStatus() != 500) {
RetrofitHelper.printDebugInfo(getActivity(), e);
Timber.e(e.toString());
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.connection_error_files), Snackbar.LENGTH_SHORT)
.show();
}
Loading
Loading
Loading
Loading
@@ -19,7 +19,6 @@ import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.events.ProjectChangedEvent;
import com.commit451.gitlab.model.Issue;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.squareup.otto.Subscribe;
 
import java.util.List;
Loading
Loading
@@ -30,6 +29,7 @@ import butterknife.OnClick;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class IssuesFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
 
Loading
Loading
@@ -93,7 +93,7 @@ public class IssuesFragment extends Fragment implements SwipeRefreshLayout.OnRef
@Override
public void failure(RetrofitError e) {
RetrofitHelper.printDebugInfo(getActivity(), e);
Timber.e(e.toString());
if(swipeLayout != null && swipeLayout.isRefreshing())
swipeLayout.setRefreshing(false);
Loading
Loading
Loading
Loading
@@ -20,7 +20,6 @@ import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.events.ProjectChangedEvent;
import com.commit451.gitlab.model.User;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.squareup.otto.Subscribe;
 
import java.util.List;
Loading
Loading
@@ -31,6 +30,7 @@ import butterknife.OnClick;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
import timber.log.Timber;
 
public class UsersFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
Loading
Loading
@@ -116,7 +116,7 @@ public class UsersFragment extends Fragment implements SwipeRefreshLayout.OnRefr
}
errorText.setVisibility(View.VISIBLE);
addUserButton.setVisibility(View.GONE);
RetrofitHelper.printDebugInfo(getActivity(), e);
Timber.e(e.toString());
Snackbar.make(getActivity().getWindow().getDecorView(), getString(R.string.connection_error_users), Snackbar.LENGTH_SHORT)
.show();
}
Loading
Loading
package com.commit451.gitlab.model;
 
import org.parceler.Parcel;
@Parcel
public class Branch {
private String name;
private boolean protected_;
String name;
boolean protected_;
public Branch(){}
public String getName() {
return name;
Loading
Loading
package com.commit451.gitlab.model;
 
import org.parceler.Parcel;
import java.util.Date;
 
@Parcel
public class DeleteResponse {
private long id;
private long group_id;
private long user_id;
private long group_access;
private long notification_level;
private Date created_at;
private Date updated_at;
long id;
long group_id;
long user_id;
long group_access;
long notification_level;
Date created_at;
Date updated_at;
public DeleteResponse(){}
public long getId() {
return id;
Loading
Loading
package com.commit451.gitlab.model;
 
import org.parceler.Parcel;
import java.util.ArrayList;
import java.util.List;
@Parcel
public class Diff {
private String diff;
private String new_path;
private String old_path;
private int a_mode;
private int b_mode;
private boolean new_file;
private boolean renamed_file;
private boolean deleted_file;
String diff;
String new_path;
String old_path;
int a_mode;
int b_mode;
boolean new_file;
boolean renamed_file;
boolean deleted_file;
public Diff(){}
public String getDiff() {
return diff;
Loading
Loading
package com.commit451.gitlab.model;
 
import org.parceler.Parcel;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Parcel
public class DiffLine {
private String id;
private String short_id;
private String title;
private String author_name;
private String author_email;
private Date created_at;
private String message;
String id;
String short_id;
String title;
String author_name;
String author_email;
Date created_at;
String message;
public DiffLine(){}
public String getId() {
return id;
Loading
Loading
package com.commit451.gitlab.model;
 
import org.parceler.Parcel;
@Parcel
public class Group {
private long id;
private String name;
private String path;
private long owner_id;
long id;
String name;
String path;
long owner_id;
public Group(){}
public long getId() {
return id;
Loading
Loading
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