diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1806683..8338154 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,23 +36,11 @@ android:name="com.facebook.FacebookActivity" android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation" android:label="@string/app_name" /> - - - - - - - - - - + android:label="Wall"> diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/SlidingImageDetailActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/SlidingImageDetailActivity.java index 1c57fbd..eaa61cd 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/SlidingImageDetailActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/SlidingImageDetailActivity.java @@ -69,7 +69,7 @@ public boolean onResourceReady(GlideDrawable resource, String model, Target urlList=new ArrayList<>(); private Context context; @@ -53,7 +54,7 @@ public int getCount() { public Object instantiateItem(ViewGroup view, final int position) { View imageLayout = inflater.inflate(R.layout.sliding_image_layout, view, false); assert imageLayout != null; - final ImageView imageView = (ImageView) imageLayout + final AspectRatioImageView imageView = (AspectRatioImageView) imageLayout .findViewById(R.id.image); if(position==0 || position==1) imageView.setImageResource(IMAGES[position]); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Adapter/SponsorAdapter.java b/app/src/main/java/com/nith/appteam/nimbus/Adapter/SponsorAdapter.java index 4e5744d..7cfa3f6 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Adapter/SponsorAdapter.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Adapter/SponsorAdapter.java @@ -44,6 +44,8 @@ public void onBindViewHolder(viewHolder holder, int position) { if(list!=null) { Sponsor s = list.get(position); if (s != null) { + holder.imageView.setScaleType(ImageView.ScaleType.FIT_XY); + holder.coreteam.setVisibility(View.GONE); if (s.getName() != null && !s.getName().isEmpty()) holder.textView.setText(s.getName()); if (s.getImg_url() != null && !s.getImg_url().isEmpty()) @@ -60,12 +62,13 @@ public int getItemCount() { public static class viewHolder extends RecyclerView.ViewHolder{ private ImageView imageView; - private TextView textView; + private TextView textView,coreteam; public viewHolder(View itemView) { super(itemView); imageView= (ImageView) itemView.findViewById(R.id.core_team_image_view); textView= (TextView) itemView.findViewById(R.id.core_team_designation); + coreteam = (TextView) itemView.findViewById(R.id.core_team_name); } } } diff --git a/app/src/main/java/com/nith/appteam/nimbus/Fragment/FbLoginFragment.java b/app/src/main/java/com/nith/appteam/nimbus/Fragment/FbLoginFragment.java index c828364..9a8fe88 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Fragment/FbLoginFragment.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Fragment/FbLoginFragment.java @@ -101,6 +101,7 @@ public void onCompleted(JSONObject object, GraphResponse response) { if (object.has("name")) { try { name = object.getString("name"); + Log.d("Login",name); } catch (JSONException e) { e.printStackTrace(); } @@ -108,14 +109,20 @@ public void onCompleted(JSONObject object, GraphResponse response) { if (object.has("email")) { try { email = object.getString("email"); + Log.d("email",email); } catch (JSONException e) { e.printStackTrace(); } } + else { + email = " "; + } if (object.has("id")) { try { + String id = object.getString("id"); picUrl = "https://graph.facebook.com/" + id + "/picture?width=200&height=200"; + Log.d("Login",picUrl); } catch (JSONException e) { e.printStackTrace(); } diff --git a/app/src/main/res/drawable/logo1.jpg b/app/src/main/res/drawable/logo1.jpg index 5808d7f..84f2af5 100644 Binary files a/app/src/main/res/drawable/logo1.jpg and b/app/src/main/res/drawable/logo1.jpg differ diff --git a/app/src/main/res/drawable/pic.jpg b/app/src/main/res/drawable/pic.jpg old mode 100755 new mode 100644 index 390388c..eac9fe9 Binary files a/app/src/main/res/drawable/pic.jpg and b/app/src/main/res/drawable/pic.jpg differ diff --git a/app/src/main/res/drawable/slideimage2.jpg b/app/src/main/res/drawable/slideimage2.jpg new file mode 100644 index 0000000..adfddd1 Binary files /dev/null and b/app/src/main/res/drawable/slideimage2.jpg differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1017ca1..7046ad6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -257,7 +257,7 @@ diff --git a/app/src/main/res/layout/activity_workshop_detail.xml b/app/src/main/res/layout/activity_workshop_detail.xml index fbca611..83d70ce 100644 --- a/app/src/main/res/layout/activity_workshop_detail.xml +++ b/app/src/main/res/layout/activity_workshop_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/w1" - android:scaleType="centerCrop" + android:scaleType="fitXY" app:layout_collapseMode="parallax" android:id="@+id/workshop_img" /> diff --git a/app/src/main/res/layout/sliding_image_layout.xml b/app/src/main/res/layout/sliding_image_layout.xml index a672c41..1a1fbf0 100644 --- a/app/src/main/res/layout/sliding_image_layout.xml +++ b/app/src/main/res/layout/sliding_image_layout.xml @@ -1,5 +1,7 @@ - - diff --git a/app/src/main/res/layout/workshops_cardview.xml b/app/src/main/res/layout/workshops_cardview.xml index 48a11c8..1cef665 100644 --- a/app/src/main/res/layout/workshops_cardview.xml +++ b/app/src/main/res/layout/workshops_cardview.xml @@ -17,7 +17,7 @@ android:layout_height="400px" android:src="@drawable/w1" android:id="@+id/workshop_image" - android:scaleType="centerCrop" /> + android:scaleType="fitXY" /> Advice: Attempt as many sets possible to score more points.\n\n 12. Winners will be announced after Nimbus 2017, and will be rewarded.\n\n 13. For any queries/complaints/bugs, contact us at appteam.nith@gmail.com - Sponsor + Sponsors * Keep yourself updated with all the happenings of NIMBUS 2k17.\n\n