Skip to content

I
InstiApp
Commit 9075f6b6 authored by Sajal Narang's avatar Sajal Narang Committed by GitHub
Browse files
Options

Merge branch 'master' into badlogin

parents b639c3cd dbf57e30
Show whitespace changes
Inline Side-by-side
Showing with 1145 additions and 185 deletions
app/src/main/assets/login.html
View file @ 9075f6b6
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
font-size: 1.05em; font-size: 1.05em;
} }
</style> </style>
</head> </head>
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
View file @ 9075f6b6
...@@ -30,6 +30,7 @@ import com.squareup.picasso.Picasso; ...@@ -30,6 +30,7 @@ import com.squareup.picasso.Picasso;
import in.ac.iitb.gymkhana.iitbapp.api.UnsafeOkHttpClient; import in.ac.iitb.gymkhana.iitbapp.api.UnsafeOkHttpClient;
import in.ac.iitb.gymkhana.iitbapp.api.model.NotificationsResponse; import in.ac.iitb.gymkhana.iitbapp.api.model.NotificationsResponse;
import in.ac.iitb.gymkhana.iitbapp.data.User; 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.CalendarFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.FeedFragment; import in.ac.iitb.gymkhana.iitbapp.fragment.FeedFragment;
import in.ac.iitb.gymkhana.iitbapp.fragment.MapFragment; import in.ac.iitb.gymkhana.iitbapp.fragment.MapFragment;
...@@ -248,6 +249,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -248,6 +249,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
case R.id.nav_settings: case R.id.nav_settings:
SettingsFragment settingsFragment = new SettingsFragment(); SettingsFragment settingsFragment = new SettingsFragment();
updateFragment(settingsFragment); updateFragment(settingsFragment);
//Checking the about fragment
//AboutFragment aboutFragment = new AboutFragment();
//updateFragment(aboutFragment);
break; break;
} }
...@@ -264,7 +268,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -264,7 +268,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
} }
bundle.putString(Constants.SESSION_ID, session.pref.getString(Constants.SESSION_ID, "Error")); bundle.putString(Constants.SESSION_ID, session.pref.getString(Constants.SESSION_ID, "Error"));
if (fragment instanceof MessMenuFragment) if (fragment instanceof MessMenuFragment)
bundle.putString(Constants.USER_HOSTEL, currentUser.getHostel()); bundle.putString(Constants.USER_HOSTEL, session.isLoggedIn() ? currentUser.getHostel() : "1");
if (fragment instanceof SettingsFragment && session.isLoggedIn()) if (fragment instanceof SettingsFragment && session.isLoggedIn())
bundle.putString(Constants.USER_ID, currentUser.getUserID()); bundle.putString(Constants.USER_ID, currentUser.getUserID());
fragment.setArguments(bundle); fragment.setArguments(bundle);
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Body.java
View file @ 9075f6b6
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -10,9 +11,8 @@ import java.util.List; ...@@ -10,9 +11,8 @@ import java.util.List;
@Entity(tableName = "bodies") @Entity(tableName = "bodies")
public class Body { public class Body {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String bodyID; String bodyID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java
View file @ 9075f6b6
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -12,9 +13,8 @@ import java.util.List; ...@@ -12,9 +13,8 @@ import java.util.List;
@Entity(tableName = "events") @Entity(tableName = "events")
public class Event { public class Event {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String eventID; String eventID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/HostelMessMenu.java
View file @ 9075f6b6
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -10,9 +11,8 @@ import java.util.List; ...@@ -10,9 +11,8 @@ import java.util.List;
@Entity(tableName = "hostelMessMenus") @Entity(tableName = "hostelMessMenus")
public class HostelMessMenu { public class HostelMessMenu {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String menuID; private String menuID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/MessMenu.java
View file @ 9075f6b6
package in.ac.iitb.gymkhana.iitbapp.data; package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
public class MessMenu { public class MessMenu {
@NonNull()
@PrimaryKey()
@SerializedName("id") @SerializedName("id")
private String mealID; private String mealID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/NewsArticle.java
View file @ 9075f6b6
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -11,10 +12,8 @@ import java.sql.Timestamp; ...@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity(tableName = "news") @Entity(tableName = "news")
public class NewsArticle { public class NewsArticle {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String articleID; private String articleID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/PlacementBlogPost.java
View file @ 9075f6b6
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -11,10 +12,8 @@ import java.sql.Timestamp; ...@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity(tableName = "placementBlogPosts") @Entity(tableName = "placementBlogPosts")
public class PlacementBlogPost { public class PlacementBlogPost {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String postID; private String postID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Role.java
View file @ 9075f6b6
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -12,10 +13,8 @@ import java.util.List; ...@@ -12,10 +13,8 @@ import java.util.List;
public class Role { public class Role {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String roleID; String roleID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/TrainingBlogPost.java
View file @ 9075f6b6
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -11,10 +12,8 @@ import java.sql.Timestamp; ...@@ -11,10 +12,8 @@ import java.sql.Timestamp;
@Entity(tableName = "trainingBlogPosts") @Entity(tableName = "trainingBlogPosts")
public class TrainingBlogPost { public class TrainingBlogPost {
@NonNull()
@PrimaryKey(autoGenerate = true) @PrimaryKey()
int db_id;
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
private String postID; private String postID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java
View file @ 9075f6b6
...@@ -4,6 +4,7 @@ import android.arch.persistence.room.ColumnInfo; ...@@ -4,6 +4,7 @@ import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.Ignore; import android.arch.persistence.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
...@@ -12,9 +13,8 @@ import java.util.List; ...@@ -12,9 +13,8 @@ import java.util.List;
@Entity(tableName = "users") @Entity(tableName = "users")
public class User { public class User {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String userID; String userID;
...@@ -70,8 +70,7 @@ public class User { ...@@ -70,8 +70,7 @@ public class User {
@Ignore @Ignore
String currentRole; String currentRole;
public User(int db_id, String userID, String userName, String userProfilePictureUrl, List<Event> userInterestedEvents, List<Event> userGoingEvents, String userEmail, String userRollNumber, String userContactNumber, String userAbout, List<Body> userFollowedBodies, List<String> userFollowedBodiesID, List<Role> userRoles, List<Role> userInstituteRoles, String userWebsiteURL, String userLDAPId, String hostel) { public User(@NonNull String userID, String userName, String userProfilePictureUrl, List<Event> userInterestedEvents, List<Event> userGoingEvents, String userEmail, String userRollNumber, String userContactNumber, String userAbout, List<Body> userFollowedBodies, List<String> userFollowedBodiesID, List<Role> userRoles, List<Role> userInstituteRoles, String userWebsiteURL, String userLDAPId, String hostel) {
this.db_id = db_id;
this.userID = userID; this.userID = userID;
this.userName = userName; this.userName = userName;
this.userProfilePictureUrl = userProfilePictureUrl; this.userProfilePictureUrl = userProfilePictureUrl;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Venue.java
View file @ 9075f6b6
...@@ -3,13 +3,14 @@ package in.ac.iitb.gymkhana.iitbapp.data; ...@@ -3,13 +3,14 @@ package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
@Entity(tableName = "venues") @Entity(tableName = "venues")
public class Venue { public class Venue {
@PrimaryKey(autoGenerate = true) @NonNull()
int db_id; @PrimaryKey()
@ColumnInfo(name = "id") @ColumnInfo(name = "id")
@SerializedName("id") @SerializedName("id")
String venueID; String venueID;
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/AboutFragment.java
View file @ 9075f6b6
...@@ -6,7 +6,11 @@ import android.support.v4.app.Fragment; ...@@ -6,7 +6,11 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView;
import com.squareup.picasso.Picasso;
import de.hdodenhof.circleimageview.CircleImageView;
import in.ac.iitb.gymkhana.iitbapp.R; import in.ac.iitb.gymkhana.iitbapp.R;
/** /**
...@@ -25,6 +29,55 @@ public class AboutFragment extends BaseFragment { ...@@ -25,6 +29,55 @@ public class AboutFragment extends BaseFragment {
Bundle savedInstanceState) { Bundle savedInstanceState) {
// Inflate the layout for this fragment // Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_about, container, false); return inflater.inflate(R.layout.fragment_about, container, false);
} }
@Override
public void onStart() {
super.onStart();
CircleImageView varunimg = getActivity().findViewById(R.id.varunimg);
CircleImageView sajalimg = getActivity().findViewById(R.id.sajalimg);
CircleImageView nihalimg = getActivity().findViewById(R.id.nihalimg);
CircleImageView ydidwaniaimg = getActivity().findViewById(R.id.ydidwaniaimg);
CircleImageView cheekuimg = getActivity().findViewById(R.id.cheekuimg);
CircleImageView sarthakimg = getActivity().findViewById(R.id.sarthakimg);
CircleImageView sohamimg = getActivity().findViewById(R.id.sohamimg);
CircleImageView mrunmayiimg = getActivity().findViewById(R.id.mrunmayiimg);
CircleImageView owaisimg = getActivity().findViewById(R.id.owaisimg);
CircleImageView hrushikeshimg = getActivity().findViewById(R.id.hrushikeshimg);
CircleImageView yashkhemimg = getActivity().findViewById(R.id.yashkhemimg);
CircleImageView bavishimg = getActivity().findViewById(R.id.bavishimg);
CircleImageView mayuimg = getActivity().findViewById(R.id.mayuimg);
CircleImageView tomarimg = getActivity().findViewById(R.id.tomarimg);
CircleImageView bijoyimg = getActivity().findViewById(R.id.bijoyimg);
CircleImageView dheerendraimg = getActivity().findViewById(R.id.dheerendraimg);
CircleImageView ranveerimg = getActivity().findViewById(R.id.ranveerimg);
CircleImageView amangourimg = getActivity().findViewById(R.id.amangourimg);
CircleImageView wnccimg = getActivity().findViewById(R.id.wnccimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/varun.jpg").into(varunimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/sajal.jpg").into(sajalimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/nihal.jpg").into(nihalimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/ydidwania.jpg").into(ydidwaniaimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/cheeku.jpg").into(cheekuimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/sarthak.jpg").into(sarthakimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/soham.jpg").into(sohamimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/mrunmayi.jpg").into(mrunmayiimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/owais.jpg").into(owaisimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/hrushikesh.jpg").into(hrushikeshimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/yashkhem.jpg").into(yashkhemimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/bavish.jpg").into(bavishimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/mayu.jpg").into(mayuimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/tomar.jpg").into(tomarimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/bijoy.jpg").into(bijoyimg);
Picasso.with(getContext()).load("https://insti.app/team-pics/dheerendra.jpg").into(dheerendraimg);
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
View file @ 9075f6b6
...@@ -113,6 +113,17 @@ public class AddEventFragment extends BaseFragment { ...@@ -113,6 +113,17 @@ public class AddEventFragment extends BaseFragment {
} }
} }
public static Timestamp makeTimestamp(int year, int month, int day, int hour, int minute) {
Calendar cal = new GregorianCalendar();
cal.set(Calendar.YEAR, year);
cal.set(Calendar.MONTH, month);
cal.set(Calendar.DATE, day);
cal.set(Calendar.HOUR_OF_DAY, hour);
cal.set(Calendar.MINUTE, minute);
return new Timestamp(cal.getTimeInMillis());
}
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
...@@ -247,17 +258,6 @@ public class AddEventFragment extends BaseFragment { ...@@ -247,17 +258,6 @@ public class AddEventFragment extends BaseFragment {
}); });
} }
public static Timestamp makeTimestamp(int year, int month, int day, int hour, int minute) {
Calendar cal = new GregorianCalendar();
cal.set(Calendar.YEAR, year);
cal.set(Calendar.MONTH, month);
cal.set(Calendar.DATE, day);
cal.set(Calendar.HOUR_OF_DAY, hour);
cal.set(Calendar.MINUTE, minute);
return new Timestamp(cal.getTimeInMillis());
}
private void sendImage() { private void sendImage() {
progressDialog.setMessage("Uploading Image"); progressDialog.setMessage("Uploading Image");
ImageUploadRequest imageUploadRequest = new ImageUploadRequest(base64Image); ImageUploadRequest imageUploadRequest = new ImageUploadRequest(base64Image);
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java
View file @ 9075f6b6
...@@ -115,7 +115,7 @@ public class BodyFragment extends Fragment { ...@@ -115,7 +115,7 @@ public class BodyFragment extends Fragment {
if (response.isSuccessful()) { if (response.isSuccessful()) {
Body body = response.body(); Body body = response.body();
new insertDbBody().execute(body); new updateDbBody().execute(body);
displayBody(body); displayBody(body);
bodySwipeRefreshLayout.setRefreshing(false); bodySwipeRefreshLayout.setRefreshing(false);
...@@ -130,7 +130,18 @@ public class BodyFragment extends Fragment { ...@@ -130,7 +130,18 @@ public class BodyFragment extends Fragment {
}); });
} }
private void setVisibleIfHasElements(int[] viewIds, List list) {
if (list != null && list.size() > 0) {
for (int viewId: viewIds){
getActivity().findViewById(viewId).setVisibility(View.VISIBLE);
}
}
}
private void displayBody(final Body body) { private void displayBody(final Body body) {
/* Skip if we're already destroyed */
if (getView() == null) return;
TextView bodyName = (TextView) getView().findViewById(R.id.body_name); TextView bodyName = (TextView) getView().findViewById(R.id.body_name);
TextView bodyDescription = (TextView) getView().findViewById(R.id.body_description); TextView bodyDescription = (TextView) getView().findViewById(R.id.body_description);
ImageView eventPicture = (ImageView) getActivity().findViewById(R.id.body_picture); ImageView eventPicture = (ImageView) getActivity().findViewById(R.id.body_picture);
...@@ -138,6 +149,12 @@ public class BodyFragment extends Fragment { ...@@ -138,6 +149,12 @@ public class BodyFragment extends Fragment {
ImageButton shareBodyButton = getActivity().findViewById(R.id.share_body_button); ImageButton shareBodyButton = getActivity().findViewById(R.id.share_body_button);
final Button followButton = getActivity().findViewById(R.id.follow_button); final Button followButton = getActivity().findViewById(R.id.follow_button);
/* Show relevant card titles */
setVisibleIfHasElements(new int[]{R.id.body_events_title, R.id.event_card_recycler_view}, body.getBodyEvents());
setVisibleIfHasElements(new int[]{R.id.body_orgs_title, R.id.org_card_recycler_view}, body.getBodyChildren());
setVisibleIfHasElements(new int[]{R.id.body_parents_title, R.id.parentorg_card_recycler_view}, body.getBodyParents());
setVisibleIfHasElements(new int[]{R.id.body_people_title, R.id.people_card_recycler_view}, body.getBodyRoles());
/* Set body information */ /* Set body information */
bodyName.setText(body.getBodyName()); bodyName.setText(body.getBodyName());
Picasso.with(getContext()).load(body.getBodyImageURL()).into(eventPicture); Picasso.with(getContext()).load(body.getBodyImageURL()).into(eventPicture);
...@@ -306,15 +323,11 @@ public class BodyFragment extends Fragment { ...@@ -306,15 +323,11 @@ public class BodyFragment extends Fragment {
private class updateDbBody extends AsyncTask<Body, Void, Integer> { private class updateDbBody extends AsyncTask<Body, Void, Integer> {
@Override @Override
protected Integer doInBackground(Body... body) { protected Integer doInBackground(Body... body) {
if (appDatabase.dbDao().getBody(body[0].getBodyID()).length > 0) {
appDatabase.dbDao().updateBody(body[0]); appDatabase.dbDao().updateBody(body[0]);
return 1; } else {
}
}
private class insertDbBody extends AsyncTask<Body, Void, Integer> {
@Override
protected Integer doInBackground(Body... body) {
appDatabase.dbDao().insertBody(body[0]); appDatabase.dbDao().insertBody(body[0]);
}
return 1; return 1;
} }
} }
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/CalendarFragment.java
View file @ 9075f6b6
...@@ -11,6 +11,7 @@ import android.view.LayoutInflater; ...@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CalendarView; import android.widget.CalendarView;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.gson.Gson; import com.google.gson.Gson;
...@@ -134,6 +135,8 @@ public class CalendarFragment extends BaseFragment { ...@@ -134,6 +135,8 @@ public class CalendarFragment extends BaseFragment {
} }
private void showEventsForDate(Date date) { private void showEventsForDate(Date date) {
/* Skip if we're already destroyed */
if (getActivity() == null) return;
final List<Event> filteredEvents = new ArrayList<Event>(); final List<Event> filteredEvents = new ArrayList<Event>();
for (Event event : events) { for (Event event : events) {
...@@ -144,6 +147,16 @@ public class CalendarFragment extends BaseFragment { ...@@ -144,6 +147,16 @@ public class CalendarFragment extends BaseFragment {
} }
} }
/* Show number of events */
TextView noEvents = getActivity().findViewById(R.id.number_of_events);
if (filteredEvents.size() == 0) {
noEvents.setText("No Events");
} else if (filteredEvents.size() == 1) {
noEvents.setText("1 Event");
} else {
noEvents.setText(Integer.toString(filteredEvents.size()) + " Events");
}
RecyclerView eventRecyclerView = (RecyclerView) getActivity().findViewById(R.id.calendar_event_card_recycler_view); RecyclerView eventRecyclerView = (RecyclerView) getActivity().findViewById(R.id.calendar_event_card_recycler_view);
FeedAdapter eventAdapter = new FeedAdapter(filteredEvents, new ItemClickListener() { FeedAdapter eventAdapter = new FeedAdapter(filteredEvents, new ItemClickListener() {
@Override @Override
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
View file @ 9075f6b6
...@@ -42,6 +42,7 @@ public class FeedFragment extends BaseFragment { ...@@ -42,6 +42,7 @@ public class FeedFragment extends BaseFragment {
private SwipeRefreshLayout feedSwipeRefreshLayout; private SwipeRefreshLayout feedSwipeRefreshLayout;
private AppDatabase appDatabase; private AppDatabase appDatabase;
private FloatingActionButton fab; private FloatingActionButton fab;
private boolean freshEventsDisplayed = false;
public FeedFragment() { public FeedFragment() {
// Required empty public constructor // Required empty public constructor
...@@ -98,6 +99,7 @@ public class FeedFragment extends BaseFragment { ...@@ -98,6 +99,7 @@ public class FeedFragment extends BaseFragment {
if (response.isSuccessful()) { if (response.isSuccessful()) {
NewsFeedResponse newsFeedResponse = response.body(); NewsFeedResponse newsFeedResponse = response.body();
List<Event> events = newsFeedResponse.getEvents(); List<Event> events = newsFeedResponse.getEvents();
freshEventsDisplayed = true;
displayEvents(events); displayEvents(events);
new updateDatabase().execute(events); new updateDatabase().execute(events);
...@@ -115,6 +117,9 @@ public class FeedFragment extends BaseFragment { ...@@ -115,6 +117,9 @@ public class FeedFragment extends BaseFragment {
} }
private void displayEvents(final List<Event> events) { private void displayEvents(final List<Event> events) {
/* Skip if we're already destroyed */
if (getActivity() == null) return;
final FeedAdapter feedAdapter = new FeedAdapter(events, new ItemClickListener() { final FeedAdapter feedAdapter = new FeedAdapter(events, new ItemClickListener() {
@Override @Override
public void onItemClick(View v, int position) { public void onItemClick(View v, int position) {
...@@ -163,7 +168,9 @@ public class FeedFragment extends BaseFragment { ...@@ -163,7 +168,9 @@ public class FeedFragment extends BaseFragment {
} }
protected void onPostExecute(List<Event> result) { protected void onPostExecute(List<Event> result) {
if (!freshEventsDisplayed) {
displayEvents(result); displayEvents(result);
} }
} }
}
} }
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MessMenuFragment.java
View file @ 9075f6b6
...@@ -15,7 +15,10 @@ import android.widget.AdapterView; ...@@ -15,7 +15,10 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Spinner; import android.widget.Spinner;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.Locale;
import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer; import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
import in.ac.iitb.gymkhana.iitbapp.Constants; import in.ac.iitb.gymkhana.iitbapp.Constants;
...@@ -25,6 +28,7 @@ import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface; ...@@ -25,6 +28,7 @@ import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator; import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase; import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
import in.ac.iitb.gymkhana.iitbapp.data.HostelMessMenu; import in.ac.iitb.gymkhana.iitbapp.data.HostelMessMenu;
import in.ac.iitb.gymkhana.iitbapp.data.MessMenu;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
...@@ -133,7 +137,29 @@ public class MessMenuFragment extends BaseFragment { ...@@ -133,7 +137,29 @@ public class MessMenuFragment extends BaseFragment {
} }
private void displayMessMenu(HostelMessMenu hostelMessMenu) { private void displayMessMenu(HostelMessMenu hostelMessMenu) {
final MessMenuAdapter messMenuAdapter = new MessMenuAdapter(hostelMessMenu.getMessMenus()); /* Skip if we're already destroyed */
if (getActivity() == null) return;
List<MessMenu> messMenus = hostelMessMenu.getMessMenus();
/* Sort by day starting today
* This could have been done in a much simpler way with Java 8 :(
* Don't try to fix this */
final List<MessMenu> sortedMenus = new ArrayList();
final Calendar calendar = Calendar.getInstance(Locale.UK);
int today = calendar.get(Calendar.DAY_OF_WEEK) - 2;
if (today == -1) { today = 6; }
for (int i = 0; i < 7; i++) {
final int day = (today + i) % 7 + 1;
for(MessMenu menu : messMenus) {
if(menu.getDay() == day) {
sortedMenus.add(menu);
}
}
}
final MessMenuAdapter messMenuAdapter = new MessMenuAdapter(sortedMenus);
getActivityBuffer().safely(new ActivityBuffer.IRunnable() { getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
@Override @Override
public void run(Activity pActivity) { public void run(Activity pActivity) {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MyEventsFragment.java
View file @ 9075f6b6
package in.ac.iitb.gymkhana.iitbapp.fragment; package in.ac.iitb.gymkhana.iitbapp.fragment;
import android.app.Activity;
import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
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.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;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
*/ */
public class MyEventsFragment extends BaseFragment { public class MyEventsFragment extends BaseFragment {
FloatingActionButton fab; private RecyclerView myEventsFeedRecyclerView;
private SwipeRefreshLayout myEventsFeedSwipeRefreshLayout;
private AppDatabase appDatabase;
private FloatingActionButton fab;
public MyEventsFragment() { public MyEventsFragment() {
// Required empty public constructor // Required empty public constructor
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_my_events, container, false); View view = inflater.inflate(R.layout.fragment_my_events, container, false);
fab = (FloatingActionButton) view.findViewById(R.id.fab); fab = (FloatingActionButton) view.findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
...@@ -44,7 +60,79 @@ public class MyEventsFragment extends BaseFragment { ...@@ -44,7 +60,79 @@ public class MyEventsFragment extends BaseFragment {
} }
}); });
return view; return view;
}
@Override
public void onStart() {
super.onStart();
appDatabase = AppDatabase.getAppDatabase(getContext());
new showEvents().execute();
myEventsFeedSwipeRefreshLayout = getActivity().findViewById(R.id.my_events_feed_swipe_refresh_layout);
myEventsFeedSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
updateOnRefresh();
myEventsFeedSwipeRefreshLayout.setRefreshing(false);
}
});
}
private void updateOnRefresh() {
new showEvents().execute();
}
private void displayEvents(final List<Event> events) {
final FeedAdapter feedAdapter = new FeedAdapter(events, new ItemClickListener() {
@Override
public void onItemClick(View v, int position) {
String eventJson = new Gson().toJson(events.get(position));
Bundle bundle = getArguments();
if (bundle == null)
bundle = new Bundle();
bundle.putString(Constants.EVENT_JSON, eventJson);
EventFragment eventFragment = new EventFragment();
eventFragment.setArguments(bundle);
FragmentManager manager = getActivity().getSupportFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
transaction.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
transaction.addToBackStack(eventFragment.getTag()).commit();
}
});
getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
@Override
public void run(Activity pActivity) {
try {
myEventsFeedRecyclerView = getActivity().findViewById(R.id.my_events_feed_recycler_view);
myEventsFeedRecyclerView.setAdapter(feedAdapter);
myEventsFeedRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
} catch (NullPointerException e) {
e.printStackTrace();
}
}
});
}
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;
} }
protected void onPostExecute(List<Event> result) {
displayEvents(result);
}
}
} }
\ No newline at end of file
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/NewsFragment.java
View file @ 9075f6b6
...@@ -37,6 +37,7 @@ public class NewsFragment extends BaseFragment { ...@@ -37,6 +37,7 @@ public class NewsFragment extends BaseFragment {
private RecyclerView newsRecyclerView; private RecyclerView newsRecyclerView;
private SwipeRefreshLayout newsSwipeRefreshLayout; private SwipeRefreshLayout newsSwipeRefreshLayout;
private AppDatabase appDatabase; private AppDatabase appDatabase;
private boolean freshNewsDisplayed = false;
public NewsFragment() { public NewsFragment() {
// Required empty public constructor // Required empty public constructor
...@@ -75,6 +76,7 @@ public class NewsFragment extends BaseFragment { ...@@ -75,6 +76,7 @@ public class NewsFragment extends BaseFragment {
public void onResponse(Call<List<NewsArticle>> call, Response<List<NewsArticle>> response) { public void onResponse(Call<List<NewsArticle>> call, Response<List<NewsArticle>> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
List<NewsArticle> articles = response.body(); List<NewsArticle> articles = response.body();
freshNewsDisplayed = true;
displayNews(articles); displayNews(articles);
new updateDatabase().execute(articles); new updateDatabase().execute(articles);
...@@ -92,6 +94,9 @@ public class NewsFragment extends BaseFragment { ...@@ -92,6 +94,9 @@ public class NewsFragment extends BaseFragment {
} }
private void displayNews(final List<NewsArticle> result) { private void displayNews(final List<NewsArticle> result) {
/* Skip if we're already destroyed */
if (getActivity() == null) return;
final NewsAdapter newsAdapter = new NewsAdapter(result, new ItemClickListener() { final NewsAdapter newsAdapter = new NewsAdapter(result, new ItemClickListener() {
@Override @Override
public void onItemClick(View v, int position) { public void onItemClick(View v, int position) {
...@@ -134,7 +139,9 @@ public class NewsFragment extends BaseFragment { ...@@ -134,7 +139,9 @@ public class NewsFragment extends BaseFragment {
} }
protected void onPostExecute(List<NewsArticle> result) { protected void onPostExecute(List<NewsArticle> result) {
if (!freshNewsDisplayed) {
displayNews(result); displayNews(result);
} }
} }
}
} }
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/PlacementBlogFragment.java
View file @ 9075f6b6
...@@ -37,6 +37,7 @@ public class PlacementBlogFragment extends BaseFragment { ...@@ -37,6 +37,7 @@ public class PlacementBlogFragment extends BaseFragment {
private RecyclerView placementFeedRecyclerView; private RecyclerView placementFeedRecyclerView;
private SwipeRefreshLayout feedSwipeRefreshLayout; private SwipeRefreshLayout feedSwipeRefreshLayout;
private AppDatabase appDatabase; private AppDatabase appDatabase;
private boolean freshBlogDisplayed = false;
public PlacementBlogFragment() { public PlacementBlogFragment() {
...@@ -76,6 +77,7 @@ public class PlacementBlogFragment extends BaseFragment { ...@@ -76,6 +77,7 @@ public class PlacementBlogFragment extends BaseFragment {
public void onResponse(Call<List<PlacementBlogPost>> call, Response<List<PlacementBlogPost>> response) { public void onResponse(Call<List<PlacementBlogPost>> call, Response<List<PlacementBlogPost>> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
List<PlacementBlogPost> posts = response.body(); List<PlacementBlogPost> posts = response.body();
freshBlogDisplayed = true;
displayPlacementFeed(posts); displayPlacementFeed(posts);
new updateDatabase().execute(posts); new updateDatabase().execute(posts);
...@@ -93,6 +95,9 @@ public class PlacementBlogFragment extends BaseFragment { ...@@ -93,6 +95,9 @@ public class PlacementBlogFragment extends BaseFragment {
} }
private void displayPlacementFeed(final List<PlacementBlogPost> result) { private void displayPlacementFeed(final List<PlacementBlogPost> result) {
/* Skip if we're already destroyed */
if (getActivity() == null) return;
final PlacementBlogAdapter placementBlogAdapter = new PlacementBlogAdapter(result, new ItemClickListener() { final PlacementBlogAdapter placementBlogAdapter = new PlacementBlogAdapter(result, new ItemClickListener() {
@Override @Override
public void onItemClick(View v, int position) { public void onItemClick(View v, int position) {
...@@ -135,7 +140,9 @@ public class PlacementBlogFragment extends BaseFragment { ...@@ -135,7 +140,9 @@ public class PlacementBlogFragment extends BaseFragment {
} }
protected void onPostExecute(List<PlacementBlogPost> result) { protected void onPostExecute(List<PlacementBlogPost> result) {
if (!freshBlogDisplayed) {
displayPlacementFeed(result); displayPlacementFeed(result);
} }
} }
}
} }
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/SettingsFragment.java
View file @ 9075f6b6
...@@ -72,7 +72,11 @@ public class SettingsFragment extends Fragment { ...@@ -72,7 +72,11 @@ public class SettingsFragment extends Fragment {
ImageView userProfilePictureImageView = getActivity().findViewById(R.id.user_card_avatar); ImageView userProfilePictureImageView = getActivity().findViewById(R.id.user_card_avatar);
TextView userNameTextView = getActivity().findViewById(R.id.user_card_name); TextView userNameTextView = getActivity().findViewById(R.id.user_card_name);
Picasso.with(getContext()).load(user.getUserProfilePictureUrl()).into(userProfilePictureImageView); Picasso.with(getContext())
.load(user.getUserProfilePictureUrl())
.resize(800, 0)
.placeholder(R.drawable.user_placeholder)
.into(userProfilePictureImageView);
userNameTextView.setText(user.getUserName()); userNameTextView.setText(user.getUserName());
Button updateProfileButton = getActivity().findViewById(R.id.settings_update_profile); Button updateProfileButton = getActivity().findViewById(R.id.settings_update_profile);
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/TrainingBlogFragment.java
View file @ 9075f6b6
...@@ -37,6 +37,7 @@ public class TrainingBlogFragment extends BaseFragment { ...@@ -37,6 +37,7 @@ public class TrainingBlogFragment extends BaseFragment {
private RecyclerView trainingFeedRecyclerView; private RecyclerView trainingFeedRecyclerView;
private SwipeRefreshLayout feedSwipeRefreshLayout; private SwipeRefreshLayout feedSwipeRefreshLayout;
private AppDatabase appDatabase; private AppDatabase appDatabase;
private boolean freshBlogDisplayed = false;
public TrainingBlogFragment() { public TrainingBlogFragment() {
...@@ -76,6 +77,7 @@ public class TrainingBlogFragment extends BaseFragment { ...@@ -76,6 +77,7 @@ public class TrainingBlogFragment extends BaseFragment {
public void onResponse(Call<List<TrainingBlogPost>> call, Response<List<TrainingBlogPost>> response) { public void onResponse(Call<List<TrainingBlogPost>> call, Response<List<TrainingBlogPost>> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
List<TrainingBlogPost> posts = response.body(); List<TrainingBlogPost> posts = response.body();
freshBlogDisplayed = true;
displayTrainingFeed(posts); displayTrainingFeed(posts);
new updateDatabase().execute(posts); new updateDatabase().execute(posts);
...@@ -93,6 +95,9 @@ public class TrainingBlogFragment extends BaseFragment { ...@@ -93,6 +95,9 @@ public class TrainingBlogFragment extends BaseFragment {
} }
private void displayTrainingFeed(final List<TrainingBlogPost> result) { private void displayTrainingFeed(final List<TrainingBlogPost> result) {
/* Skip if we're already destroyed */
if (getActivity() == null) return;
final TrainingBlogAdapter trainingBlogAdapter = new TrainingBlogAdapter(result, new ItemClickListener() { final TrainingBlogAdapter trainingBlogAdapter = new TrainingBlogAdapter(result, new ItemClickListener() {
@Override @Override
public void onItemClick(View v, int position) { public void onItemClick(View v, int position) {
...@@ -135,7 +140,9 @@ public class TrainingBlogFragment extends BaseFragment { ...@@ -135,7 +140,9 @@ public class TrainingBlogFragment extends BaseFragment {
} }
protected void onPostExecute(List<TrainingBlogPost> result) { protected void onPostExecute(List<TrainingBlogPost> result) {
if (!freshBlogDisplayed) {
displayTrainingFeed(result); displayTrainingFeed(result);
} }
} }
}
} }
app/src/main/res/drawable/ic_launcher_background.xml
View file @ 9075f6b6
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<vector <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="108dp"
android:width="108dp" android:width="108dp"
android:height="108dp"
android:viewportHeight="108" android:viewportHeight="108"
android:viewportWidth="108" android:viewportWidth="108">
xmlns:android="http://schemas.android.com/apk/res/android"> <path
<path android:fillColor="#26A69A" android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z"/> android:pathData="M0,0h108v108h-108z" />
<path android:fillColor="#00000000" android:pathData="M9,0L9,108" <path
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:fillColor="#00000000"
<path android:fillColor="#00000000" android:pathData="M19,0L19,108" android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeColor="#33FFFFFF"
<path android:fillColor="#00000000" android:pathData="M29,0L29,108" android:strokeWidth="0.8" />
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> <path
<path android:fillColor="#00000000" android:pathData="M39,0L39,108" android:fillColor="#00000000"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:pathData="M19,0L19,108"
<path android:fillColor="#00000000" android:pathData="M49,0L49,108" android:strokeColor="#33FFFFFF"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeWidth="0.8" />
<path android:fillColor="#00000000" android:pathData="M59,0L59,108" <path
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:fillColor="#00000000"
<path android:fillColor="#00000000" android:pathData="M69,0L69,108" android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeColor="#33FFFFFF"
<path android:fillColor="#00000000" android:pathData="M79,0L79,108" android:strokeWidth="0.8" />
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> <path
<path android:fillColor="#00000000" android:pathData="M89,0L89,108" android:fillColor="#00000000"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:pathData="M39,0L39,108"
<path android:fillColor="#00000000" android:pathData="M99,0L99,108" android:strokeColor="#33FFFFFF"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeWidth="0.8" />
<path android:fillColor="#00000000" android:pathData="M0,9L108,9" <path
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:fillColor="#00000000"
<path android:fillColor="#00000000" android:pathData="M0,19L108,19" android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeColor="#33FFFFFF"
<path android:fillColor="#00000000" android:pathData="M0,29L108,29" android:strokeWidth="0.8" />
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> <path
<path android:fillColor="#00000000" android:pathData="M0,39L108,39" android:fillColor="#00000000"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:pathData="M59,0L59,108"
<path android:fillColor="#00000000" android:pathData="M0,49L108,49" android:strokeColor="#33FFFFFF"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeWidth="0.8" />
<path android:fillColor="#00000000" android:pathData="M0,59L108,59" <path
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:fillColor="#00000000"
<path android:fillColor="#00000000" android:pathData="M0,69L108,69" android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeColor="#33FFFFFF"
<path android:fillColor="#00000000" android:pathData="M0,79L108,79" android:strokeWidth="0.8" />
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> <path
<path android:fillColor="#00000000" android:pathData="M0,89L108,89" android:fillColor="#00000000"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:pathData="M79,0L79,108"
<path android:fillColor="#00000000" android:pathData="M0,99L108,99" android:strokeColor="#33FFFFFF"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeWidth="0.8" />
<path android:fillColor="#00000000" android:pathData="M19,29L89,29" <path
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:fillColor="#00000000"
<path android:fillColor="#00000000" android:pathData="M19,39L89,39" android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeColor="#33FFFFFF"
<path android:fillColor="#00000000" android:pathData="M19,49L89,49" android:strokeWidth="0.8" />
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> <path
<path android:fillColor="#00000000" android:pathData="M19,59L89,59" android:fillColor="#00000000"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:pathData="M99,0L99,108"
<path android:fillColor="#00000000" android:pathData="M19,69L89,69" android:strokeColor="#33FFFFFF"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeWidth="0.8" />
<path android:fillColor="#00000000" android:pathData="M19,79L89,79" <path
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:fillColor="#00000000"
<path android:fillColor="#00000000" android:pathData="M29,19L29,89" android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeColor="#33FFFFFF"
<path android:fillColor="#00000000" android:pathData="M39,19L39,89" android:strokeWidth="0.8" />
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> <path
<path android:fillColor="#00000000" android:pathData="M49,19L49,89" android:fillColor="#00000000"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:pathData="M0,19L108,19"
<path android:fillColor="#00000000" android:pathData="M59,19L59,89" android:strokeColor="#33FFFFFF"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeWidth="0.8" />
<path android:fillColor="#00000000" android:pathData="M69,19L69,89" <path
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:fillColor="#00000000"
<path android:fillColor="#00000000" android:pathData="M79,19L79,89" android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
</vector> </vector>
app/src/main/res/drawable/ic_link_black_24dp.xml
View file @ 9075f6b6
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24.0" android:viewportHeight="24.0"
android:viewportHeight="24.0"> android:viewportWidth="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/> android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z" />
</vector> </vector>
app/src/main/res/drawable/ic_settings_black_24dp.xml
View file @ 9075f6b6
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24.0" android:viewportHeight="24.0"
android:viewportHeight="24.0"> android:viewportWidth="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/> android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
</vector> </vector>
app/src/main/res/drawable/user_placeholder.xml
View file @ 9075f6b6
<vector android:height="24dp" android:viewportHeight="2250" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:viewportWidth="2250" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:width="24dp"
<path android:fillColor="#c5c5c5" android:height="24dp"
android:pathData="M0,1125l0,-1125 1125,0 1125,0 0,1125 0,1125 -140,0c-77,0 -140,-3 -140,-6 0,-48 -51,-287 -69,-322 -5,-9 -19,-42 -32,-72 -82,-193 -257,-378 -431,-455 -37,-17 -68,-33 -68,-36 0,-3 17,-15 38,-27 20,-11 56,-40 78,-64 222,-231 179,-606 -89,-771 -102,-63 -154,-79 -267,-79 -154,-1 -248,38 -355,146 -82,83 -119,153 -141,264 -37,187 49,393 209,502 20,14 37,28 37,31 0,4 -20,14 -45,23 -73,28 -195,114 -264,184 -112,117 -177,228 -231,391 -25,76 -34,115 -56,259l-5,32 -139,0 -140,0 0,-1125z" android:strokeColor="#00000000"/> android:viewportHeight="2250"
<path android:fillColor="#fefefe" android:viewportWidth="2250">
android:pathData="M286,2208c32,-228 86,-375 194,-533 77,-111 244,-248 355,-291 25,-9 45,-19 45,-23 0,-3 -17,-17 -37,-31 -160,-109 -246,-315 -209,-502 22,-111 59,-181 141,-264 107,-108 201,-147 355,-146 113,0 165,16 267,79 195,120 281,365 205,584 -36,103 -117,207 -194,251 -21,12 -38,24 -38,27 0,3 31,19 68,36 174,77 349,262 431,455 13,30 27,63 32,72 18,35 69,274 69,322 0,3 -380,6 -845,6l-845,0 6,-42z" android:strokeColor="#00000000"/> <path
android:fillColor="#c5c5c5"
android:pathData="M0,1125l0,-1125 1125,0 1125,0 0,1125 0,1125 -140,0c-77,0 -140,-3 -140,-6 0,-48 -51,-287 -69,-322 -5,-9 -19,-42 -32,-72 -82,-193 -257,-378 -431,-455 -37,-17 -68,-33 -68,-36 0,-3 17,-15 38,-27 20,-11 56,-40 78,-64 222,-231 179,-606 -89,-771 -102,-63 -154,-79 -267,-79 -154,-1 -248,38 -355,146 -82,83 -119,153 -141,264 -37,187 49,393 209,502 20,14 37,28 37,31 0,4 -20,14 -45,23 -73,28 -195,114 -264,184 -112,117 -177,228 -231,391 -25,76 -34,115 -56,259l-5,32 -139,0 -140,0 0,-1125z"
android:strokeColor="#00000000" />
<path
android:fillColor="#fefefe"
android:pathData="M286,2208c32,-228 86,-375 194,-533 77,-111 244,-248 355,-291 25,-9 45,-19 45,-23 0,-3 -17,-17 -37,-31 -160,-109 -246,-315 -209,-502 22,-111 59,-181 141,-264 107,-108 201,-147 355,-146 113,0 165,16 267,79 195,120 281,365 205,584 -36,103 -117,207 -194,251 -21,12 -38,24 -38,27 0,3 31,19 68,36 174,77 349,262 431,455 13,30 27,63 32,72 18,35 69,274 69,322 0,3 -380,6 -845,6l-845,0 6,-42z"
android:strokeColor="#00000000" />
</vector> </vector>
app/src/main/res/layout/body_card_view.xml
View file @ 9075f6b6
...@@ -44,7 +44,10 @@ ...@@ -44,7 +44,10 @@
android:id="@+id/body_card_description" android:id="@+id/body_card_description"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Description" /> android:text="Description"
android:scrollHorizontally="true"
android:ellipsize="end"
android:maxLines="1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/feed_card.xml
View file @ 9075f6b6
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:text="LH 101" /> android:text="LH 101"
android:scrollHorizontally="true"
android:maxLines="1"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_about.xml
View file @ 9075f6b6
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.AboutFragment"> tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.AboutFragment">
<!-- TODO: Update blank fragment layout -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/core_developers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="Core Developers"
android:textSize="18sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/varunimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginEnd="30dp" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/sajalimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginStart="30dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/varun"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:gravity="center"
android:text="Varun Patil"
android:textStyle="bold" />
<TextView
android:id="@+id/sajal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="50dp"
android:gravity="center"
android:text="Sajal Narang"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/ideation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="Ideation"
android:textSize="18sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/nihalimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginEnd="60dp" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ydidwaniaimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginStart="60dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/nihal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="40dp"
android:gravity="center"
android:text="Nihal Singh"
android:textStyle="bold" />
<TextView
android:id="@+id/ydidwania"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="90dp"
android:gravity="center"
android:text="Yashvardhan Didwania"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/cheekuimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginEnd="60dp" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/sarthakimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginStart="60dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/cheeku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="20dp"
android:gravity="center"
android:text="Kumar Ayush"
android:textStyle="bold" />
<TextView
android:id="@+id/sarthak"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="80dp"
android:gravity="center"
android:text="Sarthak Khandelwal"
android:textStyle="bold" />
</LinearLayout>
<TextView <TextView
android:id="@+id/design"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="Design"
android:textSize="18sp"
android:textStyle="bold" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/sohamimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginTop="20dp" />
<TextView
android:id="@+id/soham"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="Soham Khadtare"
android:textStyle="bold" />
<TextView
android:id="@+id/developers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="Developers"
android:textSize="18sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" /> android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/mrunmayiimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginEnd="55dp" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/owaisimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/hrushikeshimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginStart="55dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/mrunmayi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Mrunmayi Mungekar"
android:textSize="13sp"
android:layout_marginEnd="15dp"
android:textStyle="bold" />
<TextView
android:id="@+id/owais"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Owais Chunawala"
android:textSize="13sp"
android:layout_marginEnd="25dp"
android:textStyle="bold" />
<TextView
android:id="@+id/hrushikesh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Hrushikesh Bodas"
android:textSize="13sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/yashkhemimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginEnd="55dp" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/bavishimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/mayuimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginStart="55dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/yashkhem"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:gravity="center"
android:textSize="13sp"
android:text="Yash Khemchandani"
android:textStyle="bold" />
<TextView
android:id="@+id/bavish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="13sp"
android:layout_marginStart="10dp"
android:text="Bavish Kulur"
android:textStyle="bold" />
<TextView
android:id="@+id/mayu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
android:gravity="center"
android:textSize="13sp"
android:text="Mayuresh Bhattu"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/alumni"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="Alumni"
android:textSize="18sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/tomarimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginEnd="55dp" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/bijoyimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/dheerendraimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginStart="55dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tomar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:gravity="center"
android:text="Abhijeet Tomar"
android:textSize="13sp"
android:textStyle="bold" />
<TextView
android:id="@+id/bijoy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="13sp"
android:text="Bijoy Singh Kochar"
android:layout_marginStart="30dp"
android:textStyle="bold" />
<TextView
android:id="@+id/dheerendra"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:gravity="center"
android:textSize="13sp"
android:text="Dheerendra Rathore"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/amangourimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginEnd="45dp" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ranveerimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginStart="45dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/ranveer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="45dp"
android:gravity="center"
android:text="Ranveer Aggarwal"
android:textStyle="bold" />
<TextView
android:id="@+id/amangour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="25dp"
android:gravity="center"
android:text="Aman Gour"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/testing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="Testing"
android:textSize="18sp"
android:textStyle="bold" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/wnccimg"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_marginTop="20dp" />
<TextView
android:id="@+id/wncc"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:textStyle="bold"
android:gravity="center"
android:text="tty0" />
<TextView
android:id="@+id/join_us"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="Join Us"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/django"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:autoLink="web"
android:linksClickable="true"
android:gravity="center"
android:text="@string/django_api"
android:textStyle="bold"
android:textColorLink="@color/colorPrimaryDark"/>
<TextView
android:id="@+id/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:autoLink="web"
android:linksClickable="true"
android:gravity="center"
android:text="@string/android_app"
android:textStyle="bold"
android:textColorLink="@color/colorPrimaryDark"/>
<TextView
android:id="@+id/angular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:autoLink="web"
android:linksClickable="true"
android:gravity="center"
android:text="@string/angular_pwa"
android:textStyle="bold"
android:textColorLink="@color/colorPrimaryDark"/>
</LinearLayout>
</ScrollView>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout> </RelativeLayout>
</LinearLayout>
app/src/main/res/layout/fragment_add_event.xml
View file @ 9075f6b6
...@@ -77,11 +77,11 @@ ...@@ -77,11 +77,11 @@
<TextView <TextView
android:id="@+id/tv_end" android:id="@+id/tv_end"
android:enabled="false"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/editTextBackground" android:background="?attr/editTextBackground"
android:enabled="false"
android:gravity="bottom" android:gravity="bottom"
android:hint="To " android:hint="To "
android:paddingRight="6dp" android:paddingRight="6dp"
......
app/src/main/res/layout/fragment_body.xml
View file @ 9075f6b6
...@@ -127,6 +127,8 @@ ...@@ -127,6 +127,8 @@
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <TextView
android:id="@+id/body_events_title"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
...@@ -136,12 +138,15 @@ ...@@ -136,12 +138,15 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/event_card_recycler_view" android:id="@+id/event_card_recycler_view"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginBottom="10dp"
android:nestedScrollingEnabled="false" /> android:nestedScrollingEnabled="false" />
<TextView <TextView
android:id="@+id/body_orgs_title"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
...@@ -151,12 +156,15 @@ ...@@ -151,12 +156,15 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/org_card_recycler_view" android:id="@+id/org_card_recycler_view"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginBottom="10dp"
android:nestedScrollingEnabled="false" /> android:nestedScrollingEnabled="false" />
<TextView <TextView
android:id="@+id/body_people_title"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
...@@ -166,12 +174,15 @@ ...@@ -166,12 +174,15 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/people_card_recycler_view" android:id="@+id/people_card_recycler_view"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginBottom="10dp"
android:nestedScrollingEnabled="false" /> android:nestedScrollingEnabled="false" />
<TextView <TextView
android:id="@+id/body_parents_title"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
...@@ -181,9 +192,10 @@ ...@@ -181,9 +192,10 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/parentorg_card_recycler_view" android:id="@+id/parentorg_card_recycler_view"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginBottom="10dp"
android:nestedScrollingEnabled="false" /> android:nestedScrollingEnabled="false" />
</LinearLayout> </LinearLayout>
...@@ -194,7 +206,7 @@ ...@@ -194,7 +206,7 @@
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_calendar.xml
View file @ 9075f6b6
...@@ -41,13 +41,14 @@ ...@@ -41,13 +41,14 @@
android:background="@android:color/darker_gray" /> android:background="@android:color/darker_gray" />
<TextView <TextView
android:id="@+id/number_of_events"
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_below="@id/simpleCalendarView" android:layout_below="@id/simpleCalendarView"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/round_text_box" android:background="@drawable/round_text_box"
android:gravity="center" android:gravity="center"
android:text="# Events Today" android:text="No Events"
android:textColor="@color/secondaryTextColor" /> android:textColor="@color/secondaryTextColor" />
</RelativeLayout> </RelativeLayout>
...@@ -77,7 +78,7 @@ ...@@ -77,7 +78,7 @@
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_feed.xml
View file @ 9075f6b6
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_mess_menu.xml
View file @ 9075f6b6
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
...@@ -36,7 +35,7 @@ ...@@ -36,7 +35,7 @@
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_my_events.xml
View file @ 9075f6b6
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/relative_layout" android:id="@+id/relative_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v4.widget.SwipeRefreshLayout
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">
<android.support.v7.widget.RecyclerView
android:id="@+id/my_events_feed_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp" />
</android.support.v4.widget.SwipeRefreshLayout>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/fab" android:id="@+id/fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_news.xml
View file @ 9075f6b6
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_placement_blog.xml
View file @ 9075f6b6
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_profile.xml
View file @ 9075f6b6
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
...@@ -92,11 +91,12 @@ ...@@ -92,11 +91,12 @@
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_training_blog.xml
View file @ 9075f6b6
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" > android:gravity="center">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/nav_header_main.xml
View file @ 9075f6b6
...@@ -17,20 +17,20 @@ ...@@ -17,20 +17,20 @@
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="64dp" android:layout_height="64dp"
android:paddingTop="@dimen/nav_header_vertical_spacing" android:paddingTop="@dimen/nav_header_vertical_spacing"
app:srcCompat="@mipmap/ic_launcher_round" /> android:src="@drawable/user_placeholder" />
<TextView <TextView
android:id="@+id/user_name_nav_header" android:id="@+id/user_name_nav_header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing" android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="Android Studio" android:text="Guest"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView <TextView
android:id="@+id/user_rollno_nav_header" android:id="@+id/user_rollno_nav_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="android.studio@android.com" /> android:text="IITB User" />
</LinearLayout> </LinearLayout>
app/src/main/res/layout/role_card.xml
View file @ 9075f6b6
...@@ -44,7 +44,10 @@ ...@@ -44,7 +44,10 @@
android:id="@+id/role_card_role" android:id="@+id/role_card_role"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Role" /> android:text="Role"
android:scrollHorizontally="true"
android:ellipsize="end"
android:maxLines="1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file @ 9075f6b6
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/> <background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>
\ No newline at end of file
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file @ 9075f6b6
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/> <background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 9075f6b6
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<string name="Cancel">Cancel</string> <string name="Cancel">Cancel</string>
<string name="gps_network_not_enabled">Location is not enabled. Please turn on your location from the settings.</string> <string name="gps_network_not_enabled">Location is not enabled. Please turn on your location from the settings.</string>
<string name="open_location_settings">Open Location Settings</string> <string name="open_location_settings">Open Location Settings</string>
<string name="django_api"> <a href="https://github.com/wncc/IITBapp"> Django API</a></string>
<string name="android_app"> <a href= "https://github.com/wncc/InstiApp"> Android App</a></string>
<string name="angular_pwa"> <a href= "https://github.com/pulsejet/iitb-app-angular"> Angular PWA </a></string>
<string-array name="hostels_array"> <string-array name="hostels_array">
<item>Hostel 1</item> <item>Hostel 1</item>
......
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