Skip to content

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

Merge pull request #129 from yashkhem1/master 

Updated About Fragment and fragment_about.xml
parents f58db83f a9626608
Show whitespace changes
Inline Side-by-side
Showing with 654 additions and 6 deletions
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
View file @ dbf57e30
...@@ -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;
} }
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/AboutFragment.java
View file @ dbf57e30
...@@ -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/res/layout/fragment_about.xml
View file @ dbf57e30
<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/values/strings.xml
View file @ dbf57e30
...@@ -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