Skip to content

I
InstiApp
Commit 3cf8b3cc authored by mayu's avatar mayu
Browse files
Options

Merge remote-tracking branch 'upstream/master'

parents bcd49923 1e242b79
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 330 deletions
app/build.gradle
View file @ 3cf8b3cc
......@@ -4,7 +4,7 @@ android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "in.ac.iitb.gymkhana.iitbapp"
applicationId "app.insti"
manifestPlaceholders 'appAuthRedirectScheme': 'https'
minSdkVersion 17
targetSdkVersion 27
......
app/google-services.json
View file @ 3cf8b3cc
......@@ -10,7 +10,7 @@
"client_info": {
"mobilesdk_app_id": "1:306601329049:android:950a72a311331b9c",
"android_client_info": {
"package_name": "in.ac.iitb.gymkhana.iitbapp"
"package_name": "app.insti"
}
},
"oauth_client": [
......
app/src/androidTest/java/in/ac/iitb/gymkhana/iitbapp/ExampleInstrumentedTest.java → app/src/androidTest/java/app/insti/ExampleInstrumentedTest.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp;
package app.insti;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
......@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("in.ac.iitb.gymkhana.iitbapp", appContext.getPackageName());
assertEquals("app.insti", appContext.getPackageName());
}
}
app/src/main/AndroidManifest.xml
View file @ 3cf8b3cc
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="in.ac.iitb.gymkhana.iitbapp">
package="app.insti">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
......@@ -26,6 +26,7 @@
<activity
android:name=".MainActivity"
android:screenOrientation="portrait"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/AppTheme.NoActionBar">
......@@ -37,6 +38,7 @@
</activity>
<activity
android:name=".LoginActivity"
android:screenOrientation="portrait"
android:launchMode="singleTask">
<intent-filter>
......@@ -74,21 +76,21 @@
</receiver>
<service
android:name="in.ac.iitb.gymkhana.iitbapp.gcm.MyGcmListenerService"
android:name="app.insti.gcm.MyGcmListenerService"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
</intent-filter>
</service>
<service
android:name="in.ac.iitb.gymkhana.iitbapp.gcm.MyInstanceIDListenerService"
android:name="app.insti.gcm.MyInstanceIDListenerService"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.gms.iid.InstanceID" />
</intent-filter>
</service>
<service
android:name="in.ac.iitb.gymkhana.iitbapp.gcm.RegistrationIntentService"
android:name="app.insti.gcm.RegistrationIntentService"
android:exported="false"></service>
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/Constants.java → app/src/main/java/app/insti/Constants.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp;
package app.insti;
public class Constants {
public static final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 1;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java → app/src/main/java/app/insti/LoginActivity.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp;
package app.insti;
import android.app.ProgressDialog;
......@@ -18,9 +18,9 @@ import android.widget.Toast;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.api.model.LoginResponse;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.api.model.LoginResponse;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java → app/src/main/java/app/insti/MainActivity.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp;
package app.insti;
import android.Manifest;
import android.content.Intent;
......@@ -27,26 +27,26 @@ import com.google.gson.Gson;
import com.jakewharton.picasso.OkHttp3Downloader;
import com.squareup.picasso.Picasso;
import in.ac.iitb.gymkhana.iitbapp.api.UnsafeOkHttpClient;
import in.ac.iitb.gymkhana.iitbapp.api.model.NotificationsResponse;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import in.ac.iitb.gymkhana.iitbapp.fragment.AboutFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.CalendarFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.FeedFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.MapFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.MessMenuFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.MyEventsFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.NewsFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.NotificationsFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.PlacementBlogFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.ProfileFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.QLinksFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.SettingsFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.TrainingBlogFragment;
import static in.ac.iitb.gymkhana.iitbapp.Constants.MY_PERMISSIONS_REQUEST_ACCESS_LOCATION;
import static in.ac.iitb.gymkhana.iitbapp.Constants.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
import static in.ac.iitb.gymkhana.iitbapp.Constants.RESULT_LOAD_IMAGE;
import app.insti.api.UnsafeOkHttpClient;
import app.insti.api.model.NotificationsResponse;
import app.insti.data.User;
import app.insti.fragment.AboutFragment;
import app.insti.fragment.CalendarFragment;
import app.insti.fragment.FeedFragment;
import app.insti.fragment.MapFragment;
import app.insti.fragment.MessMenuFragment;
import app.insti.fragment.MyEventsFragment;
import app.insti.fragment.NewsFragment;
import app.insti.fragment.NotificationsFragment;
import app.insti.fragment.PlacementBlogFragment;
import app.insti.fragment.ProfileFragment;
import app.insti.fragment.QLinksFragment;
import app.insti.fragment.SettingsFragment;
import app.insti.fragment.TrainingBlogFragment;
import static app.insti.Constants.MY_PERMISSIONS_REQUEST_ACCESS_LOCATION;
import static app.insti.Constants.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
import static app.insti.Constants.RESULT_LOAD_IMAGE;
public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
......@@ -188,11 +188,11 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (id == R.id.action_notifications) {
/*if (id == R.id.action_notifications) {
showNotifications = true;
// fetchNotifications();
return true;
}
}*/
return super.onOptionsItemSelected(item);
}
......@@ -333,4 +333,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
}
}
public boolean createEventAccess() {
if (currentUser == null || currentUser.getUserRoles() == null || currentUser.getUserRoles().size() == 0)
return false;
return true;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/PeopleSuggestionAdapter.java → app/src/main/java/app/insti/PeopleSuggestionAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp;
package app.insti;
import android.content.Context;
import android.view.LayoutInflater;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/SessionManager.java → app/src/main/java/app/insti/SessionManager.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp;
package app.insti;
import android.content.Context;
import android.content.Intent;
......@@ -6,7 +6,7 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.util.Log;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import app.insti.data.User;
public class SessionManager {
SharedPreferences pref;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/ShareURLMaker.java → app/src/main/java/app/insti/ShareURLMaker.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp;
package app.insti;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import app.insti.data.Body;
import app.insti.data.Event;
/**
* Created by varun on 03-Apr-18.
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/BodyAdapter.java → app/src/main/java/app/insti/adapter/BodyAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
......@@ -12,9 +12,9 @@ import com.squareup.picasso.Picasso;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.data.Body;
public class BodyAdapter extends RecyclerView.Adapter<BodyAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/FeedAdapter.java → app/src/main/java/app/insti/adapter/FeedAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
......@@ -15,10 +15,10 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import in.ac.iitb.gymkhana.iitbapp.data.Venue;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.data.Event;
import app.insti.data.Venue;
public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/MessMenuAdapter.java → app/src/main/java/app/insti/adapter/MessMenuAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
......@@ -10,8 +10,8 @@ import android.widget.TextView;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.MessMenu;
import app.insti.R;
import app.insti.data.MessMenu;
public class MessMenuAdapter extends RecyclerView.Adapter<MessMenuAdapter.ViewHolder> {
private List<MessMenu> messMenus;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/NewsAdapter.java → app/src/main/java/app/insti/adapter/NewsAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
......@@ -15,9 +15,9 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.NewsArticle;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.data.NewsArticle;
import ru.noties.markwon.Markwon;
public class NewsAdapter extends RecyclerView.Adapter<NewsAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/NotificationsAdapter.java → app/src/main/java/app/insti/adapter/NotificationsAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
......@@ -9,9 +9,9 @@ import android.widget.TextView;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.api.model.AppNotification;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.api.model.AppNotification;
public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdapter.Viewholder> {
private List<AppNotification> notifications;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/PlacementBlogAdapter.java → app/src/main/java/app/insti/adapter/PlacementBlogAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
......@@ -14,9 +14,9 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.PlacementBlogPost;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.data.PlacementBlogPost;
import ru.noties.markwon.Markwon;
public class PlacementBlogAdapter extends RecyclerView.Adapter<PlacementBlogAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/RoleAdapter.java → app/src/main/java/app/insti/adapter/RoleAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
......@@ -13,10 +13,10 @@ import com.squareup.picasso.Picasso;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
import in.ac.iitb.gymkhana.iitbapp.data.Role;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.data.Body;
import app.insti.data.Role;
public class RoleAdapter extends RecyclerView.Adapter<RoleAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/TabAdapter.java → app/src/main/java/app/insti/adapter/TabAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/TrainingBlogAdapter.java → app/src/main/java/app/insti/adapter/TrainingBlogAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
......@@ -14,9 +14,9 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.TrainingBlogPost;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.data.TrainingBlogPost;
import ru.noties.markwon.Markwon;
public class TrainingBlogAdapter extends RecyclerView.Adapter<TrainingBlogAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/UserAdapter.java → app/src/main/java/app/insti/adapter/UserAdapter.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.adapter;
package app.insti.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
......@@ -12,9 +12,9 @@ import com.squareup.picasso.Picasso;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.data.User;
public class UserAdapter extends RecyclerView.Adapter<UserAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/RetrofitInterface.java → app/src/main/java/app/insti/api/RetrofitInterface.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api;
package app.insti.api;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateRequest;
import in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateResponse;
import in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadRequest;
import in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadResponse;
import in.ac.iitb.gymkhana.iitbapp.api.model.LoginResponse;
import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse;
import in.ac.iitb.gymkhana.iitbapp.data.HostelMessMenu;
import in.ac.iitb.gymkhana.iitbapp.data.NewsArticle;
import in.ac.iitb.gymkhana.iitbapp.data.PlacementBlogPost;
import in.ac.iitb.gymkhana.iitbapp.data.TrainingBlogPost;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import app.insti.api.model.EventCreateRequest;
import app.insti.api.model.EventCreateResponse;
import app.insti.api.model.ImageUploadRequest;
import app.insti.api.model.ImageUploadResponse;
import app.insti.api.model.LoginResponse;
import app.insti.api.model.NewsFeedResponse;
import app.insti.data.HostelMessMenu;
import app.insti.data.NewsArticle;
import app.insti.data.PlacementBlogPost;
import app.insti.data.TrainingBlogPost;
import app.insti.data.User;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.GET;
......@@ -41,7 +41,7 @@ public interface RetrofitInterface {
Call<User> getUser(@Header("Cookie") String sessionId, @Path("uuid") String uuid);
@GET("bodies/{uuid}")
Call<in.ac.iitb.gymkhana.iitbapp.data.Body> getBody(@Header("Cookie") String sessionId, @Path("uuid") String uuid);
Call<app.insti.data.Body> getBody(@Header("Cookie") String sessionId, @Path("uuid") String uuid);
@GET("bodies/{bodyID}/follow")
Call<Void> updateBodyFollowing(@Header("Cookie") String sessionID, @Path("bodyID") String eventID, @Query("action") int action);
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/ServiceGenerator.java → app/src/main/java/app/insti/api/ServiceGenerator.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api;
package app.insti.api;
import okhttp3.OkHttpClient;
import okhttp3.logging.HttpLoggingInterceptor;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/AppNotification.java → app/src/main/java/app/insti/api/model/AppNotification.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
import com.google.gson.annotations.SerializedName;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/EventCreateRequest.java → app/src/main/java/app/insti/api/model/EventCreateRequest.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
import com.google.gson.annotations.SerializedName;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/EventCreateResponse.java → app/src/main/java/app/insti/api/model/EventCreateResponse.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
/**
* Created by mrunz on 15/7/17.
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/ImageUploadRequest.java → app/src/main/java/app/insti/api/model/ImageUploadRequest.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
import com.google.gson.annotations.SerializedName;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/ImageUploadResponse.java → app/src/main/java/app/insti/api/model/ImageUploadResponse.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
import com.google.gson.annotations.SerializedName;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/LoginResponse.java → app/src/main/java/app/insti/api/model/LoginResponse.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
import com.google.gson.annotations.SerializedName;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import app.insti.data.User;
public class LoginResponse {
@SerializedName("sessionid")
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/NewsFeedResponse.java → app/src/main/java/app/insti/api/model/NewsFeedResponse.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
import com.google.gson.annotations.SerializedName;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import app.insti.data.Event;
public class NewsFeedResponse {
@SerializedName("data")
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/NotificationsRequest.java → app/src/main/java/app/insti/api/model/NotificationsRequest.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.api.model;
package app.insti.api.model;
public class NotificationsRequest {
private int from;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/AppDatabase.java → app/src/main/java/app/insti/data/AppDatabase.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.Database;
import android.arch.persistence.room.Room;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Body.java → app/src/main/java/app/insti/data/Body.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Converters.java → app/src/main/java/app/insti/data/Converters.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.TypeConverter;
import android.util.Log;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/DbDao.java → app/src/main/java/app/insti/data/DbDao.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
......@@ -13,6 +13,9 @@ public interface DbDao {
@Query("SELECT * FROM events")
List<Event> getAllEvents();
@Query("SELECT * FROM events WHERE user_ues <> 0")
List<Event> getFollowingEvents();
@Query("SELECT * FROM bodies")
List<Body> getAllBodies();
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java → app/src/main/java/app/insti/data/Event.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/HostelMessMenu.java → app/src/main/java/app/insti/data/HostelMessMenu.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/MessMenu.java → app/src/main/java/app/insti/data/MessMenu.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/NewsArticle.java → app/src/main/java/app/insti/data/NewsArticle.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/PlacementBlogPost.java → app/src/main/java/app/insti/data/PlacementBlogPost.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Role.java → app/src/main/java/app/insti/data/Role.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/TrainingBlogPost.java → app/src/main/java/app/insti/data/TrainingBlogPost.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java → app/src/main/java/app/insti/data/User.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Venue.java → app/src/main/java/app/insti/data/Venue.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.data;
package app.insti.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/AboutFragment.java → app/src/main/java/app/insti/fragment/AboutFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.os.Bundle;
......@@ -11,7 +11,7 @@ import android.widget.ImageView;
import com.squareup.picasso.Picasso;
import de.hdodenhof.circleimageview.CircleImageView;
import in.ac.iitb.gymkhana.iitbapp.R;
import app.insti.R;
/**
* A simple {@link Fragment} subclass.
......@@ -74,10 +74,5 @@ public class AboutFragment extends BaseFragment {
Picasso.with(getContext()).load("https://insti.app/team-pics/ranveer.jpg").into(ranveerimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/amangour.jpg").into(amangourimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/wncc.jpg").into(wnccimg);
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/AddEventFragment.java → app/src/main/java/app/insti/fragment/AddEventFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.Manifest;
import android.app.DatePickerDialog;
......@@ -41,21 +41,21 @@ import java.util.GregorianCalendar;
import butterknife.BindView;
import butterknife.ButterKnife;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateRequest;
import in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateResponse;
import in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadRequest;
import in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadResponse;
import app.insti.Constants;
import app.insti.R;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.api.model.EventCreateRequest;
import app.insti.api.model.EventCreateResponse;
import app.insti.api.model.ImageUploadRequest;
import app.insti.api.model.ImageUploadResponse;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import static android.app.Activity.RESULT_OK;
import static in.ac.iitb.gymkhana.iitbapp.Constants.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
import static in.ac.iitb.gymkhana.iitbapp.Constants.RESULT_LOAD_IMAGE;
import static app.insti.Constants.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
import static app.insti.Constants.RESULT_LOAD_IMAGE;
public class AddEventFragment extends BaseFragment {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BaseFragment.java → app/src/main/java/app/insti/fragment/BaseFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.app.Activity;
import android.content.Context;
import android.support.v4.app.Fragment;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import app.insti.ActivityBuffer;
/**
* A simple {@link Fragment} subclass.
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java → app/src/main/java/app/insti/fragment/BodyFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.content.Intent;
......@@ -25,21 +25,21 @@ import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.MainActivity;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.ShareURLMaker;
import in.ac.iitb.gymkhana.iitbapp.adapter.BodyAdapter;
import in.ac.iitb.gymkhana.iitbapp.adapter.FeedAdapter;
import in.ac.iitb.gymkhana.iitbapp.adapter.UserAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import in.ac.iitb.gymkhana.iitbapp.data.Role;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.MainActivity;
import app.insti.R;
import app.insti.ShareURLMaker;
import app.insti.adapter.BodyAdapter;
import app.insti.adapter.FeedAdapter;
import app.insti.adapter.UserAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.AppDatabase;
import app.insti.data.Body;
import app.insti.data.Event;
import app.insti.data.Role;
import app.insti.data.User;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyRecyclerViewFragment.java → app/src/main/java/app/insti/fragment/BodyRecyclerViewFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.os.Bundle;
......@@ -15,11 +15,11 @@ import com.google.gson.reflect.TypeToken;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.BodyAdapter;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.adapter.BodyAdapter;
import app.insti.data.Body;
/**
* A simple {@link Fragment} subclass.
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/CalendarFragment.java → app/src/main/java/app/insti/fragment/CalendarFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.os.Bundle;
......@@ -26,15 +26,15 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.MainActivity;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.FeedAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.MainActivity;
import app.insti.R;
import app.insti.adapter.FeedAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.api.model.NewsFeedResponse;
import app.insti.data.Event;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......@@ -87,6 +87,9 @@ public class CalendarFragment extends BaseFragment {
((MainActivity) getActivity()).updateFragment(addEventFragment);
}
});
if (((MainActivity)getActivity()).createEventAccess()) {
fab.setVisibility(View.VISIBLE);
}
updateEvents();
return view;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java → app/src/main/java/app/insti/fragment/EventFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.content.Intent;
......@@ -27,18 +27,18 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.MainActivity;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.ShareURLMaker;
import in.ac.iitb.gymkhana.iitbapp.adapter.BodyAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import in.ac.iitb.gymkhana.iitbapp.data.Venue;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.MainActivity;
import app.insti.R;
import app.insti.ShareURLMaker;
import app.insti.adapter.BodyAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.AppDatabase;
import app.insti.data.Body;
import app.insti.data.Event;
import app.insti.data.Venue;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventRecyclerViewFragment.java → app/src/main/java/app/insti/fragment/EventRecyclerViewFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
......@@ -14,11 +14,11 @@ import com.google.gson.reflect.TypeToken;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.FeedAdapter;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.adapter.FeedAdapter;
import app.insti.data.Event;
/**
* A simple {@link Fragment} subclass.
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java → app/src/main/java/app/insti/fragment/FeedFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.app.Activity;
......@@ -19,16 +19,17 @@ import com.google.gson.Gson;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.FeedAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import app.insti.ActivityBuffer;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.MainActivity;
import app.insti.R;
import app.insti.adapter.FeedAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.api.model.NewsFeedResponse;
import app.insti.data.AppDatabase;
import app.insti.data.Event;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......@@ -85,6 +86,10 @@ public class FeedFragment extends BaseFragment {
public void onStart() {
super.onStart();
if (((MainActivity) getActivity()).createEventAccess()) {
fab.setVisibility(View.VISIBLE);
}
appDatabase = AppDatabase.getAppDatabase(getContext());
new showEventsFromDB().execute();
......@@ -149,7 +154,9 @@ public class FeedFragment extends BaseFragment {
}
}
});
getActivity().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
View view = getActivity().findViewById(R.id.loadingPanel);
if (view != null)
view.setVisibility(View.GONE);
}
private class updateDatabase extends AsyncTask<List<Event>, Void, Integer> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MapFragment.java → app/src/main/java/app/insti/fragment/MapFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.Manifest;
import android.app.AlertDialog;
......@@ -46,8 +46,8 @@ import com.google.android.gms.maps.model.MarkerOptions;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.R;
import app.insti.Constants;
import app.insti.R;
import static android.content.Context.LOCATION_SERVICE;
......@@ -238,8 +238,6 @@ public class MapFragment extends BaseFragment implements OnMapReadyCallback, Loc
googleMap.setMinZoomPreference(14.5f);
// Position the map's camera near Mumbai
LatLng iitb = new LatLng(19.1334, 72.9133);
googleMap.addMarker(new MarkerOptions().position(iitb)
.title("Marker in IITB"));
googleMap.moveCamera(CameraUpdateFactory.newLatLng(iitb));
}
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MessMenuFragment.java → app/src/main/java/app/insti/fragment/MessMenuFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.app.Activity;
......@@ -20,15 +20,15 @@ import java.util.Calendar;
import java.util.List;
import java.util.Locale;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.MessMenuAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.HostelMessMenu;
import in.ac.iitb.gymkhana.iitbapp.data.MessMenu;
import app.insti.ActivityBuffer;
import app.insti.Constants;
import app.insti.R;
import app.insti.adapter.MessMenuAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.AppDatabase;
import app.insti.data.HostelMessMenu;
import app.insti.data.MessMenu;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MyEventsFragment.java → app/src/main/java/app/insti/fragment/MyEventsFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.app.Activity;
......@@ -17,15 +17,17 @@ import android.view.ViewGroup;
import com.google.gson.Gson;
import java.util.ArrayList;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.FeedAdapter;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import app.insti.ActivityBuffer;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.MainActivity;
import app.insti.R;
import app.insti.adapter.FeedAdapter;
import app.insti.data.AppDatabase;
import app.insti.data.Event;
/**
* A simple {@link Fragment} subclass.
......@@ -66,6 +68,10 @@ public class MyEventsFragment extends BaseFragment {
public void onStart() {
super.onStart();
if (((MainActivity)getActivity()).createEventAccess()) {
fab.setVisibility(View.VISIBLE);
}
appDatabase = AppDatabase.getAppDatabase(getContext());
new showEvents().execute();
......@@ -98,6 +104,7 @@ public class MyEventsFragment extends BaseFragment {
eventFragment.setArguments(bundle);
FragmentManager manager = getActivity().getSupportFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
transaction.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
transaction.addToBackStack(eventFragment.getTag()).commit();
}
......@@ -114,21 +121,15 @@ public class MyEventsFragment extends BaseFragment {
}
}
});
getActivity().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
}
private class showEvents extends AsyncTask<String, Void, List<Event>> {
@Override
protected List<Event> doInBackground(String... events) {
List<Event> temp = appDatabase.dbDao().getAllEvents();
List<Event> eventsfollowing = appDatabase.dbDao().getAllEvents();
eventsfollowing.clear();
int k = temp.size();
for (int i = 0; i < k; i++) {
if (temp.get(i).getEventUserUes() != 0) eventsfollowing.add(temp.get(i));
}
return eventsfollowing;
return appDatabase.dbDao().getFollowingEvents();
}
protected void onPostExecute(List<Event> result) {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/NewsFragment.java → app/src/main/java/app/insti/fragment/NewsFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.app.Activity;
......@@ -16,15 +16,15 @@ import android.view.ViewGroup;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.NewsAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.NewsArticle;
import app.insti.ActivityBuffer;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.adapter.NewsAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.AppDatabase;
import app.insti.data.NewsArticle;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/NotificationsFragment.java → app/src/main/java/app/insti/fragment/NotificationsFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.os.Bundle;
......@@ -13,12 +13,12 @@ import com.google.gson.Gson;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.NotificationsAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.model.AppNotification;
import in.ac.iitb.gymkhana.iitbapp.api.model.NotificationsResponse;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.adapter.NotificationsAdapter;
import app.insti.api.model.AppNotification;
import app.insti.api.model.NotificationsResponse;
/**
* A simple {@link Fragment} subclass.
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/PlacementBlogFragment.java → app/src/main/java/app/insti/fragment/PlacementBlogFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.app.Activity;
......@@ -16,15 +16,15 @@ import android.view.ViewGroup;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.PlacementBlogAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.PlacementBlogPost;
import app.insti.ActivityBuffer;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.adapter.PlacementBlogAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.AppDatabase;
import app.insti.data.PlacementBlogPost;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/ProfileFragment.java → app/src/main/java/app/insti/fragment/ProfileFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.os.Bundle;
......@@ -18,17 +18,17 @@ import com.squareup.picasso.Picasso;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.RoleAdapter;
import in.ac.iitb.gymkhana.iitbapp.adapter.TabAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
import in.ac.iitb.gymkhana.iitbapp.data.Role;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.adapter.RoleAdapter;
import app.insti.adapter.TabAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.Body;
import app.insti.data.Event;
import app.insti.data.Role;
import app.insti.data.User;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/QLinksFragment.java → app/src/main/java/app/insti/fragment/QLinksFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.content.Intent;
import android.net.Uri;
......@@ -10,7 +10,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import in.ac.iitb.gymkhana.iitbapp.R;
import app.insti.R;
public class QLinksFragment extends BaseFragment {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/SettingsFragment.java → app/src/main/java/app/insti/fragment/SettingsFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.content.Intent;
......@@ -16,13 +16,13 @@ import android.widget.TextView;
import com.squareup.picasso.Picasso;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.LoginActivity;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.SessionManager;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.User;
import app.insti.Constants;
import app.insti.LoginActivity;
import app.insti.R;
import app.insti.SessionManager;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.User;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/TrainingBlogFragment.java → app/src/main/java/app/insti/fragment/TrainingBlogFragment.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.fragment;
package app.insti.fragment;
import android.app.Activity;
......@@ -16,15 +16,15 @@ import android.view.ViewGroup;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.TrainingBlogAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.TrainingBlogPost;
import app.insti.ActivityBuffer;
import app.insti.Constants;
import app.insti.ItemClickListener;
import app.insti.R;
import app.insti.adapter.TrainingBlogAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.ServiceGenerator;
import app.insti.data.AppDatabase;
import app.insti.data.TrainingBlogPost;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/gcm/MyGcmListenerService.java → app/src/main/java/app/insti/gcm/MyGcmListenerService.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.gcm;
package app.insti.gcm;
import android.app.NotificationManager;
......@@ -13,8 +13,8 @@ import android.util.Log;
import com.google.android.gms.gcm.GcmListenerService;
import in.ac.iitb.gymkhana.iitbapp.MainActivity;
import in.ac.iitb.gymkhana.iitbapp.R;
import app.insti.MainActivity;
import app.insti.R;
public class MyGcmListenerService extends GcmListenerService {
private static final String TAG = "MyGcmListenerService";
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/gcm/RegistrationIntentService.java → app/src/main/java/app/insti/gcm/RegistrationIntentService.java
View file @ 3cf8b3cc
package in.ac.iitb.gymkhana.iitbapp.gcm;
package app.insti.gcm;
import android.annotation.TargetApi;
......@@ -16,7 +16,7 @@ import android.widget.Toast;
import com.google.android.gms.gcm.GoogleCloudMessaging;
import com.google.android.gms.iid.InstanceID;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import app.insti.Constants;
@TargetApi(Build.VERSION_CODES.CUPCAKE)
......
app/src/main/res/layout/app_bar_main.xml
View file @ 3cf8b3cc
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.MainActivity">
tools:context="app.insti.MainActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/content_main.xml
View file @ 3cf8b3cc
......@@ -7,5 +7,5 @@
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="in.ac.iitb.gymkhana.iitbapp.MainActivity"
tools:context="app.insti.MainActivity"
tools:showIn="@layout/app_bar_main" />
app/src/main/res/layout/fragment_about.xml
View file @ 3cf8b3cc
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.AboutFragment">
tools:context="app.insti.fragment.AboutFragment">
<ScrollView
......
app/src/main/res/layout/fragment_add_event.xml
View file @ 3cf8b3cc
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.AddEventFragment">
tools:context="app.insti.fragment.AddEventFragment">
<ScrollView
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_calendar.xml
View file @ 3cf8b3cc
......@@ -18,7 +18,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<!-- TODO: Update blank fragment layout -->
<View
android:layout_width="match_parent"
android:layout_height="60dp"
......@@ -72,7 +71,8 @@
android:layout_alignParentRight="true"
android:layout_margin="16dp"
android:src="@android:drawable/ic_input_add"
android:tint="@android:color/black" />
android:tint="@android:color/black"
android:visibility="invisible" />
<RelativeLayout
android:id="@+id/loadingPanel"
......
app/src/main/res/layout/fragment_event.xml
View file @ 3cf8b3cc
......@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.EventFragment">
tools:context="app.insti.fragment.EventFragment">
<ScrollView
android:layout_width="match_parent"
......@@ -19,10 +19,9 @@
<ImageView
android:id="@+id/event_picture_2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_height="300dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter" />
android:scaleType="centerCrop" />
<android.support.v7.widget.CardView
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_feed.xml
View file @ 3cf8b3cc
......@@ -8,7 +8,7 @@
android:id="@+id/feed_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.FeedFragment">
tools:context="app.insti.fragment.FeedFragment">
<android.support.v7.widget.RecyclerView
android:id="@+id/feed_recycler_view"
......@@ -25,7 +25,8 @@
android:layout_alignParentRight="true"
android:layout_margin="16dp"
android:src="@android:drawable/ic_input_add"
android:tint="@android:color/black" />
android:tint="@android:color/black"
android:visibility="invisible" />
<RelativeLayout
android:id="@+id/loadingPanel"
......
app/src/main/res/layout/fragment_map.xml
View file @ 3cf8b3cc
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.MapFragment">
tools:context="app.insti.fragment.MapFragment">
<fragment
android:id="@+id/viewMap"
......
app/src/main/res/layout/fragment_mess_menu.xml
View file @ 3cf8b3cc
......@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.MessMenuFragment">
tools:context="app.insti.fragment.MessMenuFragment">
<Spinner
android:id="@+id/hostel_spinner"
......@@ -21,7 +21,7 @@
android:id="@+id/mess_menu_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.MessMenuFragment">
tools:context="app.insti.fragment.MessMenuFragment">
<android.support.v7.widget.RecyclerView
android:id="@+id/mess_menu_recycler_view"
......
app/src/main/res/layout/fragment_my_events.xml
View file @ 3cf8b3cc
......@@ -8,7 +8,7 @@
android:id="@+id/my_events_feed_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.MyEventsFragment">
tools:context="app.insti.fragment.MyEventsFragment">
<android.support.v7.widget.RecyclerView
android:id="@+id/my_events_feed_recycler_view"
......@@ -26,5 +26,18 @@
android:layout_alignParentRight="true"
android:layout_margin="16dp"
android:src="@android:drawable/ic_input_add"
android:tint="@android:color/black" />
android:tint="@android:color/black"
android:visibility="invisible" />
<RelativeLayout
android:id="@+id/loadingPanel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true" />
</RelativeLayout>
</RelativeLayout>
app/src/main/res/layout/fragment_news.xml
View file @ 3cf8b3cc
......@@ -2,13 +2,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.NewsFragment">
tools:context="app.insti.fragment.NewsFragment">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/news_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.NewsFragment">
tools:context="app.insti.fragment.NewsFragment">
<android.support.v7.widget.RecyclerView
android:id="@+id/news_recycler_view"
......
app/src/main/res/layout/fragment_notifications.xml
View file @ 3cf8b3cc
......@@ -2,7 +2,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.NotificationsFragment">
tools:context="app.insti.fragment.NotificationsFragment">
<android.support.v7.widget.RecyclerView
android:id="@+id/notifications_recycler_view"
......
app/src/main/res/layout/fragment_placement_blog.xml
View file @ 3cf8b3cc
......@@ -2,13 +2,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.PlacementBlogFragment">
tools:context="app.insti.fragment.PlacementBlogFragment">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/placement_feed_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.PlacementBlogFrament">
tools:context="app.insti.fragment.PlacementBlogFrament">
<android.support.v7.widget.RecyclerView
android:id="@+id/placement_feed_recycler_view"
......
app/src/main/res/layout/fragment_profile.xml
View file @ 3cf8b3cc
......@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.ProfileFragment">
tools:context="app.insti.fragment.ProfileFragment">
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_qlinks.xml
View file @ 3cf8b3cc
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.QLinksFragment">
tools:context="app.insti.fragment.QLinksFragment">
<ScrollView
android:layout_width="fill_parent"
......
app/src/main/res/layout/fragment_training_blog.xml
View file @ 3cf8b3cc
......@@ -2,13 +2,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.TrainingBlogFragment">
tools:context="app.insti.fragment.TrainingBlogFragment">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/training_feed_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.TrainingBlogFragment">
tools:context="app.insti.fragment.TrainingBlogFragment">
<android.support.v7.widget.RecyclerView
android:id="@+id/training_feed_recycler_view"
......
app/src/main/res/menu/main.xml
View file @ 3cf8b3cc
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
<!--<item
android:id="@+id/action_notifications"
android:icon="@drawable/ic_notifications_black_24dp"
android:orderInCategory="1"
android:title="Notifications"
app:showAsAction="always" />
app:showAsAction="always" />-->
</menu>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment