Update project structure

app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
             android:resource="@color/colorPrimary" />
 
         <activity
-            android:name=".MainActivity"
+            android:name=".activity.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
@@ -101,7 +101,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".LoginActivity"
+            android:name=".activity.LoginActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/app/insti/SessionManager.java

@@ -6,10 +6,11 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.util.Log;
 
+import app.insti.activity.LoginActivity;
 import app.insti.data.User;
 
 public class SessionManager {
-    SharedPreferences pref;
+    public SharedPreferences pref;
     Editor editor;
     Context context;
     int PRIVATE_MODE = 0;

app/src/main/java/app/insti/LoginActivity.java → app/src/main/java/app/insti/activity/LoginActivity.java

-package app.insti;
+package app.insti.activity;
 
 
 import android.app.ProgressDialog;
@@ -18,6 +18,8 @@ import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.InstanceIdResult;
 
+import app.insti.R;
+import app.insti.SessionManager;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.ServiceGenerator;
 import app.insti.api.model.LoginResponse;

app/src/main/java/app/insti/MainActivity.java → app/src/main/java/app/insti/activity/MainActivity.java

-package app.insti;
+package app.insti.activity;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -24,7 +24,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.webkit.WebChromeClient;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -34,9 +33,11 @@ import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.InstanceIdResult;
 import com.squareup.picasso.Picasso;
 
+import app.insti.Constants;
+import app.insti.R;
+import app.insti.SessionManager;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.ServiceGenerator;
-import app.insti.api.UnsafeOkHttpClient;
 import app.insti.data.Body;
 import app.insti.data.Event;
 import app.insti.data.Role;

app/src/main/java/app/insti/fragment/AddEventFragment.java

@@ -25,7 +25,7 @@ import android.widget.Toast;
 import com.google.gson.Gson;
 
 import app.insti.Constants;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.ServiceGenerator;

app/src/main/java/app/insti/fragment/BodyFragment.java

@@ -38,7 +38,7 @@ import java.util.List;
 
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.ShareURLMaker;
 import app.insti.adapter.BodyAdapter;

app/src/main/java/app/insti/fragment/CalendarFragment.java

@@ -29,7 +29,7 @@ import java.util.TimeZone;
 
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.FeedAdapter;
 import app.insti.api.RetrofitInterface;

app/src/main/java/app/insti/fragment/EventFragment.java

@@ -44,7 +44,7 @@ import java.util.List;
 
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.ShareURLMaker;
 import app.insti.adapter.BodyAdapter;

app/src/main/java/app/insti/fragment/ExploreFragment.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.BodyAdapter;
 import app.insti.adapter.FeedAdapter;

app/src/main/java/app/insti/fragment/FeedFragment.java

@@ -23,7 +23,7 @@ import java.util.List;
 import app.insti.ActivityBuffer;
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.FeedAdapter;
 import app.insti.api.RetrofitInterface;

app/src/main/java/app/insti/fragment/MapFragment.java

@@ -87,7 +87,7 @@ import java.util.Locale;
 import java.util.regex.Pattern;
 
 import app.insti.Constants;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.ServiceGenerator;

app/src/main/java/app/insti/fragment/MyEventsFragment.java

@@ -18,13 +18,12 @@ import android.view.ViewGroup;
 
 import com.google.gson.Gson;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import app.insti.ActivityBuffer;
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.FeedAdapter;
 import app.insti.data.AppDatabase;

app/src/main/java/app/insti/fragment/NewsFragment.java

@@ -26,7 +26,7 @@ import java.util.List;
 import app.insti.ActivityBuffer;
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.NewsAdapter;
 import app.insti.api.RetrofitInterface;

app/src/main/java/app/insti/fragment/NotificationsFragment.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.NotificationsAdapter;
 import app.insti.api.RetrofitInterface;

app/src/main/java/app/insti/fragment/PlacementBlogFragment.java

@@ -19,7 +19,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +26,7 @@ import java.util.List;
 import app.insti.ActivityBuffer;
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.PlacementBlogAdapter;
 import app.insti.api.RetrofitInterface;

app/src/main/java/app/insti/fragment/SettingsFragment.java

@@ -18,7 +18,7 @@ import android.widget.TextView;
 import com.squareup.picasso.Picasso;
 
 import app.insti.Constants;
-import app.insti.LoginActivity;
+import app.insti.activity.LoginActivity;
 import app.insti.R;
 import app.insti.SessionManager;
 import app.insti.api.RetrofitInterface;

app/src/main/java/app/insti/fragment/TrainingBlogFragment.java

@@ -26,7 +26,7 @@ import java.util.List;
 import app.insti.ActivityBuffer;
 import app.insti.Constants;
 import app.insti.ItemClickListener;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.adapter.TrainingBlogAdapter;
 import app.insti.api.RetrofitInterface;

app/src/main/java/app/insti/notifications/NotificationIntentService.java

@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import app.insti.Constants;
-import app.insti.MainActivity;
+import app.insti.activity.MainActivity;
 import app.insti.R;
 import app.insti.SessionManager;
 import app.insti.api.RetrofitInterface;

app/src/main/res/layout/app_bar_main.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="app.insti.MainActivity">
+    tools:context="app.insti.activity.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"

app/src/main/res/layout/content_main.xml

@@ -7,5 +7,5 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="app.insti.MainActivity"
+    tools:context="app.insti.activity.MainActivity"
     tools:showIn="@layout/app_bar_main" />