Refactor packages to be more Androidy

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".activities.GitlabActivity"
+            android:name=".activity.GitlabActivity"
             android:theme="@android:style/Theme.NoDisplay"
             android:noHistory="true" >
             <intent-filter>
@@ -25,35 +25,35 @@
             </intent-filter>
         </activity>
-        <activity android:name=".activities.ProjectActivity" />
-        <activity android:name=".activities.LoginActivity" />
-        <activity android:name=".activities.ProjectsActivity"
+        <activity android:name=".activity.ProjectActivity" />
+        <activity android:name=".activity.LoginActivity" />
+        <activity android:name=".activity.ProjectsActivity"
             android:theme="@style/Activity.Projects"/>
-        <activity android:name=".activities.GroupsActivity"
+        <activity android:name=".activity.GroupsActivity"
             android:theme="@style/Activity.Groups"/>
         <activity
-            android:name=".activities.FileActivity">
+            android:name=".activity.FileActivity">
         </activity>
         <activity
-            android:name=".activities.IssueActivity" >
+            android:name=".activity.IssueActivity" >
         </activity>
         <activity
-            android:name=".activities.DiffActivity" >
+            android:name=".activity.DiffActivity" >
         </activity>
-        <activity android:name=".activities.AboutActivity"/>
-        <activity android:name=".activities.AddUserActivity"/>
-        <activity android:name=".activities.UserActivity"
+        <activity android:name=".activity.AboutActivity"/>
+        <activity android:name=".activity.AddUserActivity"/>
+        <activity android:name=".activity.UserActivity"
             android:theme="@style/Activity.User"/>
-        <activity android:name=".activities.SearchActivity"/>
-        <activity android:name=".activities.GroupActivity"
+        <activity android:name=".activity.SearchActivity"/>
+        <activity android:name=".activity.GroupActivity"
             android:theme="@style/Activity.Group"/>
-        <activity android:name=".activities.MergeRequestActivity"/>
-        <activity android:name=".dialogs.NewIssuePopupDialog" android:theme="@style/Activity.Translucent"/>
+        <activity android:name=".activity.MergeRequestActivity"/>
+        <activity android:name=".dialog.NewIssuePopupDialog" android:theme="@style/Activity.Translucent"/>
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="${fabric_key}" />

app/src/main/java/com/commit451/gitlab/activities/AboutActivity.java → app/src/main/java/com/commit451/gitlab/activity/AboutActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -18,9 +18,9 @@ import android.widget.TextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.Contributor;
-import com.commit451.gitlab.tools.ImageUtil;
-import com.commit451.gitlab.tools.IntentUtil;
-import com.commit451.gitlab.tools.WindowUtil;
+import com.commit451.gitlab.util.ImageUtil;
+import com.commit451.gitlab.util.IntentUtil;
+import com.commit451.gitlab.util.WindowUtil;
 import com.jawnnypoo.physicslayout.Physics;
 import com.jawnnypoo.physicslayout.PhysicsConfig;
 import com.jawnnypoo.physicslayout.PhysicsFrameLayout;

app/src/main/java/com/commit451/gitlab/activities/AddUserActivity.java → app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -19,11 +19,11 @@ import com.commit451.gitlab.GitLabApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.MemberAdapter;
 import com.commit451.gitlab.api.GitLabClient;
-import com.commit451.gitlab.dialogs.AccessDialog;
-import com.commit451.gitlab.events.UserAddedEvent;
+import com.commit451.gitlab.dialog.AccessDialog;
+import com.commit451.gitlab.event.UserAddedEvent;
 import com.commit451.gitlab.model.Group;
 import com.commit451.gitlab.model.User;
-import com.commit451.gitlab.tools.KeyboardUtil;
+import com.commit451.gitlab.util.KeyboardUtil;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/activities/BaseActivity.java → app/src/main/java/com/commit451/gitlab/activity/BaseActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AppCompatActivity;

app/src/main/java/com/commit451/gitlab/activities/DiffActivity.java → app/src/main/java/com/commit451/gitlab/activity/DiffActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -14,8 +14,8 @@ import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.Commit;
 import com.commit451.gitlab.model.Diff;
 import com.commit451.gitlab.model.Project;
-import com.commit451.gitlab.views.DiffView;
-import com.commit451.gitlab.views.MessageView;
+import com.commit451.gitlab.view.DiffView;
+import com.commit451.gitlab.view.MessageView;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/activities/FileActivity.java → app/src/main/java/com/commit451/gitlab/activity/FileActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;

app/src/main/java/com/commit451/gitlab/activities/GitlabActivity.java → app/src/main/java/com/commit451/gitlab/activity/GitlabActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.app.Activity;
 import android.os.Bundle;
@@ -6,7 +6,7 @@ import android.os.Bundle;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.data.Prefs;
 import com.commit451.gitlab.model.Account;
-import com.commit451.gitlab.tools.NavigationManager;
+import com.commit451.gitlab.util.NavigationManager;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/activities/GroupActivity.java → app/src/main/java/com/commit451/gitlab/activity/GroupActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;

app/src/main/java/com/commit451/gitlab/activities/GroupsActivity.java → app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,8 +16,8 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.GroupAdapter;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.Group;
-import com.commit451.gitlab.tools.NavigationManager;
-import com.commit451.gitlab.viewHolders.GroupViewHolder;
+import com.commit451.gitlab.util.NavigationManager;
+import com.commit451.gitlab.viewHolder.GroupViewHolder;
 import java.util.List;

app/src/main/java/com/commit451/gitlab/activities/IssueActivity.java → app/src/main/java/com/commit451/gitlab/activity/IssueActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -18,14 +18,14 @@ import com.commit451.gitlab.GitLabApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.IssueDetailsAdapter;
 import com.commit451.gitlab.api.GitLabClient;
-import com.commit451.gitlab.dialogs.AssigneeDialog;
-import com.commit451.gitlab.events.IssueChangedEvent;
+import com.commit451.gitlab.dialog.AssigneeDialog;
+import com.commit451.gitlab.event.IssueChangedEvent;
 import com.commit451.gitlab.model.Issue;
 import com.commit451.gitlab.model.Note;
 import com.commit451.gitlab.model.Project;
-import com.commit451.gitlab.tools.IntentUtil;
-import com.commit451.gitlab.tools.KeyboardUtil;
-import com.commit451.gitlab.tools.NavigationManager;
+import com.commit451.gitlab.util.IntentUtil;
+import com.commit451.gitlab.util.KeyboardUtil;
+import com.commit451.gitlab.util.NavigationManager;
 import com.squareup.otto.Subscribe;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/activities/LoginActivity.java → app/src/main/java/com/commit451/gitlab/activity/LoginActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.Manifest;
 import android.annotation.TargetApi;
@@ -28,9 +28,9 @@ import com.commit451.gitlab.model.Session;
 import com.commit451.gitlab.model.User;
 import com.commit451.gitlab.ssl.X509CertificateException;
 import com.commit451.gitlab.ssl.X509Util;
-import com.commit451.gitlab.tools.KeyboardUtil;
-import com.commit451.gitlab.tools.NavigationManager;
-import com.commit451.gitlab.views.EmailAutoCompleteTextView;
+import com.commit451.gitlab.util.KeyboardUtil;
+import com.commit451.gitlab.util.NavigationManager;
+import com.commit451.gitlab.view.EmailAutoCompleteTextView;
 import java.security.cert.CertificateEncodingException;
 import java.util.regex.Pattern;

app/src/main/java/com/commit451/gitlab/activities/MergeRequestActivity.java → app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -19,7 +19,7 @@ import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.MergeRequest;
 import com.commit451.gitlab.model.MergeRequestComment;
 import com.commit451.gitlab.model.Project;
-import com.commit451.gitlab.tools.KeyboardUtil;
+import com.commit451.gitlab.util.KeyboardUtil;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/activities/ProjectActivity.java → app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -18,16 +18,16 @@ import com.commit451.gitlab.GitLabApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.SectionsPagerAdapter;
 import com.commit451.gitlab.api.GitLabClient;
-import com.commit451.gitlab.events.ProjectReloadEvent;
-import com.commit451.gitlab.fragments.CommitsFragment;
-import com.commit451.gitlab.fragments.FilesFragment;
-import com.commit451.gitlab.fragments.IssuesFragment;
-import com.commit451.gitlab.fragments.MergeRequestsFragment;
-import com.commit451.gitlab.fragments.MembersFragment;
-import com.commit451.gitlab.fragments.OverviewFragment;
+import com.commit451.gitlab.event.ProjectReloadEvent;
+import com.commit451.gitlab.fragment.CommitsFragment;
+import com.commit451.gitlab.fragment.FilesFragment;
+import com.commit451.gitlab.fragment.IssuesFragment;
+import com.commit451.gitlab.fragment.MergeRequestsFragment;
+import com.commit451.gitlab.fragment.MembersFragment;
+import com.commit451.gitlab.fragment.OverviewFragment;
 import com.commit451.gitlab.model.Branch;
 import com.commit451.gitlab.model.Project;
-import com.commit451.gitlab.tools.IntentUtil;
+import com.commit451.gitlab.util.IntentUtil;
 import org.parceler.Parcels;

app/src/main/java/com/commit451/gitlab/activities/ProjectsActivity.java → app/src/main/java/com/commit451/gitlab/activity/ProjectsActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -15,8 +15,8 @@ import android.view.View;
 import com.commit451.gitlab.GitLabApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.ProjectsPagerAdapter;
-import com.commit451.gitlab.events.CloseDrawerEvent;
-import com.commit451.gitlab.tools.NavigationManager;
+import com.commit451.gitlab.event.CloseDrawerEvent;
+import com.commit451.gitlab.util.NavigationManager;
 import com.squareup.otto.Subscribe;
 import butterknife.Bind;

app/src/main/java/com/commit451/gitlab/activities/SearchActivity.java → app/src/main/java/com/commit451/gitlab/activity/SearchActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,7 +16,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.SearchPagerAdapter;
-import com.commit451.gitlab.tools.KeyboardUtil;
+import com.commit451.gitlab.util.KeyboardUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/activities/SettingsActivity.java → app/src/main/java/com/commit451/gitlab/activity/SettingsActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.content.Context;
 import android.content.Intent;

app/src/main/java/com/commit451/gitlab/activities/UserActivity.java → app/src/main/java/com/commit451/gitlab/activity/UserActivity.java

-package com.commit451.gitlab.activities;
+package com.commit451.gitlab.activity;
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
@@ -27,8 +27,8 @@ import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.User;
 import com.commit451.gitlab.model.rss.Entry;
 import com.commit451.gitlab.model.rss.UserFeed;
-import com.commit451.gitlab.tools.ImageUtil;
-import com.commit451.gitlab.tools.IntentUtil;
+import com.commit451.gitlab.util.ImageUtil;
+import com.commit451.gitlab.util.IntentUtil;
 import com.pnikosis.materialishprogress.ProgressWheel;
 import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Target;

app/src/main/java/com/commit451/gitlab/adapter/AccessAdapter.java

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import com.commit451.easel.Easel;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.viewHolders.AccessViewHolder;
+import com.commit451.gitlab.viewHolder.AccessViewHolder;
 /**
  * Adapter to show the access levels

app/src/main/java/com/commit451/gitlab/adapter/AccountsAdapter.java

@@ -8,8 +8,8 @@ import android.widget.PopupMenu;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.Account;
-import com.commit451.gitlab.viewHolders.AccountFooterViewHolder;
-import com.commit451.gitlab.viewHolders.AccountViewHolder;
+import com.commit451.gitlab.viewHolder.AccountFooterViewHolder;
+import com.commit451.gitlab.viewHolder.AccountViewHolder;
 import java.util.ArrayList;
 import java.util.Collection;

app/src/main/java/com/commit451/gitlab/adapter/AssigneeAdapter.java

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import com.commit451.easel.Easel;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.User;
-import com.commit451.gitlab.viewHolders.AssigneeViewHolder;
+import com.commit451.gitlab.viewHolder.AssigneeViewHolder;
 import java.util.ArrayList;
 import java.util.Collection;