Skip to content

Commit

Permalink
Merge pull request #96 from adi23arora/master
Browse files Browse the repository at this point in the history 
Lots of changes & fixes
  • Loading branch information
@adi23arora
adi23arora authored Mar 29, 2018
2 parents f7b75bf + 8b2ba3b commit a6ea91f
Show file tree
Hide file tree
Showing 16 changed files with 307 additions and 270 deletions.
29 changes: 19 additions & 10 deletions app/src/main/java/com/nith/appteam/nimbus/Activity/ContributorsActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {

//contributorsItems.add(new contributorsItem("", BASE_URL + ".png", BASE_URL + ""));

//4th Year
contributorsItems.add(new contributorsItem("Ashish Gurjar", BASE_URL + "akgurjar.png", BASE_URL + "akgurjar"));
contributorsItems.add(new contributorsItem("Sahil Ramola", BASE_URL + "RamolaWeb.png", BASE_URL + "RamolaWeb"));
contributorsItems.add(new contributorsItem("Sukhbir Singh", BASE_URL + "sukhbir-singh.png",BASE_URL + "sukhbir-singh"));
Expand All @@ -40,23 +41,31 @@ protected void onCreate(Bundle savedInstanceState) {
contributorsItems.add(new contributorsItem("Goutham Reddy ", BASE_URL + "zeus512.png", BASE_URL + "zeus512"));
contributorsItems.add(new contributorsItem("Vijaya Laxmi", BASE_URL + "vijaya22.png", BASE_URL + "vijaya22"));

contributorsItems.add(new contributorsItem("Suraj Negi", BASE_URL + "Akatsuki06.png",BASE_URL + "Akatsuki06"));
//3rd Year
contributorsItems.add(new contributorsItem("Aditya Arora", BASE_URL + "adi23arora.png",BASE_URL + "adi23arora"));
contributorsItems.add(new contributorsItem("B Jatin Rao", BASE_URL + "Jatin0312.png", BASE_URL + "Jatin0312"));
contributorsItems.add(new contributorsItem("Nitin Sharma", BASE_URL + "iamNitin16.png", BASE_URL + "iamNitin16"));
contributorsItems.add(new contributorsItem("Suraj Negi", BASE_URL + "Akatsuki06.png",BASE_URL + "Akatsuki06"));
contributorsItems.add(new contributorsItem("Parvesh Dhull", BASE_URL + "Parveshdhull.png", BASE_URL + "Parveshdhull"));
contributorsItems.add(new contributorsItem("Nitin", BASE_URL + "iamNitin16.png", BASE_URL + "iamNitin16"));
contributorsItems.add(new contributorsItem("Jatin", BASE_URL + "Jatin0312.png", BASE_URL + "Jatin0312"));
contributorsItems.add(new contributorsItem("Vibhor Garg", BASE_URL + "vibhorg.png", BASE_URL + "vibhorg"));
contributorsItems.add(new contributorsItem("Kumar Shashwat", BASE_URL + "octacode.png",BASE_URL + "octacode"));


contributorsItems.add(new contributorsItem("Hemant Singh ", BASE_URL + "joshafest.png", BASE_URL + "joshafest"));
contributorsItems.add(new contributorsItem("Aditya Wazir", BASE_URL + "adityawazir.png",BASE_URL + "adityawazir"));
//2nd Year
contributorsItems.add(new contributorsItem("Bharat Shah", BASE_URL + "bharatshah1498.png",BASE_URL + "bharatshah1498"));
contributorsItems.add(new contributorsItem("Aman Pratap Singh", BASE_URL + "mnprtpsingh.png",BASE_URL + "mnprtpsingh"));
contributorsItems.add(new contributorsItem("Palak Sood", BASE_URL + "palak97.png",BASE_URL + "palak97"));
contributorsItems.add(new contributorsItem("Kartik Saxena", BASE_URL + "SaxenaKartik.png",BASE_URL + "SaxenaKartik"));
contributorsItems.add(new contributorsItem("Muskan Jhunjhunwalla", BASE_URL + "musukeshu.png",BASE_URL + "musukeshu"));
contributorsItems.add(new contributorsItem("Anubhaw Bhalotia", BASE_URL + "anubhawbhalotia.png",BASE_URL + "anubhawbhalotia"));
contributorsItems.add(new contributorsItem("Kaushal Kishore", BASE_URL + "kaushal16124.png",BASE_URL + "kaushal16124"));

//1st Year
contributorsItems.add(new contributorsItem("Utkarsh Singh", BASE_URL + "utkarshsingh99.png", BASE_URL + "utkarshsingh99"));
contributorsItems.add(new contributorsItem("Vishal Parmar", BASE_URL + "Vishal17599.png", BASE_URL + "Vishal17599"));
contributorsItems.add(new contributorsItem("Abhinav Lamba", BASE_URL + "Abhinavlamba.png", BASE_URL + "Abhinavlamba"));
contributorsItems.add(new contributorsItem("Abhiraj Singh Rathore", BASE_URL + "AbhirajSinghRathore.png", BASE_URL + "AbhirajSingh99"));
contributorsItems.add(new contributorsItem("Alisha Mehta", BASE_URL + "Alisha1116.png", BASE_URL + "Alisha1116"));
contributorsItems.add(new contributorsItem("Anshu Akansha", BASE_URL + "AnshuAkansha52227.png", BASE_URL + "AnshuAkansha"));
contributorsItems.add(new contributorsItem("Daniyaal Khan", BASE_URL + "drtweety.png", BASE_URL + "drtweety"));
contributorsItems.add(new contributorsItem("Kumar Kartikay", BASE_URL + "Kartikay26.png", BASE_URL + "Kartikay26"));
contributorsItems.add(new contributorsItem("Tanvi Mahajan", BASE_URL + "tanvi003.png", BASE_URL + "tanvi003"));


ContributorAdapter = new contributorsAdapter(contributorsItems, ContributorsActivity.this);
rvContributors.setAdapter(ContributorAdapter);
Expand Down
77 changes: 45 additions & 32 deletions app/src/main/java/com/nith/appteam/nimbus/Activity/CoreTeamActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ public class CoreTeamActivity extends AppCompatActivity {
CoreTeamAdapter core_team_adapter;
ArrayList<CoreTeamItem> array_list;
Toolbar coreTeamToolbar;
private static final String BASE_URL="https://api-hillfair-2k16.herokuapp.com/";
private static final String BASE_URL_JSEC="http://nimbus2k17api.herokuapp.com/images/";
// private static final String BASE_URL="https://api-hillfair-2k16.herokuapp.com/";
// private static final String BASE_URL_JSEC="http://nimbus2k17api.herokuapp.com/images/";

private static final String BASE_URL_CORE = "https://nimbusapi.herokuapp.com/images/core_images/";

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -28,36 +30,47 @@ protected void onCreate(Bundle savedInstanceState) {

recycler_view=(RecyclerView)findViewById(R.id.core_team_list);
array_list=new ArrayList<>();
array_list.add(new CoreTeamItem("Ajay K. Sharma","Director",BASE_URL+"photos/director.jpg"));
array_list.add(new CoreTeamItem("Dr. A.S. Singha","Dean Student Welfare",BASE_URL+"photos/as.jpg"));
array_list.add(new CoreTeamItem("Dr Saroj Thakur","Faculty Coordinator",BASE_URL_JSEC+"saroj.jpg"));

array_list.add(new CoreTeamItem("Abhinav Anand","Secretary (Technical Activities)",BASE_URL_JSEC+"abhinav.jpg"));
array_list.add(new CoreTeamItem("Pranav Bhardwaj","Club Secretary (Core)",BASE_URL_JSEC+"pranav.jpg"));
array_list.add(new CoreTeamItem("Harsh Sharma","Club Secretary (Departmental)",BASE_URL_JSEC+"harsh.jpg"));
array_list.add(new CoreTeamItem("Harshit Nadda","Secretary (Finance and treasury)",BASE_URL_JSEC+"harshit.jpg"));
array_list.add(new CoreTeamItem("Rohit Raman","Secretary (Finance and treasury)",BASE_URL_JSEC+"rohit.jpg"));
array_list.add(new CoreTeamItem("Pooja Bayana","Secretary (Public Relation)",BASE_URL_JSEC+"pooja.jpg"));
array_list.add(new CoreTeamItem("Himanshu Khandelwal","Jt. Secretary (Public Relation)",BASE_URL_JSEC+"himanshu.jpg"));
array_list.add(new CoreTeamItem("Ishan Dhiman","Creative Head",BASE_URL_JSEC+"ishan.jpg"));
array_list.add(new CoreTeamItem("Shubam Rana","Graphic Head",BASE_URL_JSEC+"shubam.jpg"));
array_list.add(new CoreTeamItem("Saloni Bakshi","Web Head",BASE_URL_JSEC+"saloni.jpg"));
array_list.add(new CoreTeamItem("Chetanya Kaushal","Secretary (Hospitality)",BASE_URL+"chetanya.jpg"));
array_list.add(new CoreTeamItem("Abhisek Mehra","Secretary (Registration)",BASE_URL_JSEC+"abhishekm.jpg"));
array_list.add(new CoreTeamItem("Abhishek Singh Parihar","Secretary (Accomodation)",BASE_URL_JSEC+"abhisheks.JPG"));
array_list.add(new CoreTeamItem("Shubham Mahajan","Secretary (Transportation)",BASE_URL_JSEC+"shubham.jpg"));
array_list.add(new CoreTeamItem("Nishant Chaudhary","Secretary (Promotional & Marketing)",BASE_URL_JSEC+"nishant.jpg"));
array_list.add(new CoreTeamItem("Medisetti Tanuja","App Team Head",BASE_URL_JSEC+"medisetti.jpg"));
array_list.add(new CoreTeamItem("Anurag Sharma","Event Quality Head",BASE_URL+"anurag.jpg"));
array_list.add(new CoreTeamItem("Tushar joshi","Event Scheduling Manager",BASE_URL+"tushar.jpg"));
array_list.add(new CoreTeamItem("Abhimanyu Kumar","Secretary (Design & Decoration)",BASE_URL_JSEC+"abhimanyu.jpg"));
array_list.add(new CoreTeamItem("Chirag Tyagi","Secretary (Technical Decoration)",BASE_URL_JSEC+"chirag.jpg"));
array_list.add(new CoreTeamItem("Sumit Kumar Singh","Jt. Secretary (Technical Decoration)",BASE_URL_JSEC+"sumit.jpg"));
array_list.add(new CoreTeamItem("Aditya Verma","Secretary (Discipline (Boy))",BASE_URL_JSEC+"aditya.jpg"));
array_list.add(new CoreTeamItem("Kunal Sharma","Jt. Secretary (Discipline (Boy))",BASE_URL_JSEC+"kunal.jpg"));
array_list.add(new CoreTeamItem("Shriya Kaul","Secretary (Discipline (Girl))",BASE_URL_JSEC+"shriya.jpg"));
array_list.add(new CoreTeamItem("Pranab Mukamia","Secretary (Environmental)",BASE_URL_JSEC+"pranab.jpg"));
array_list.add(new CoreTeamItem("Rajat Dohroo","Secretary (Human Value & Ethics)",BASE_URL_JSEC+"rajat.jpg"));

array_list.add(new CoreTeamItem("Prof. Vinod Yadava","Director",BASE_URL_CORE + "director.jpg"));
array_list.add(new CoreTeamItem("Dr. A.S. Singha","Dean Student Welfare",BASE_URL_CORE + "as_singha.jpg"));
array_list.add(new CoreTeamItem("Dr. Saroj Thakur","Faculty Coordinator",BASE_URL_CORE + "saroj_thakur.jpg"));
array_list.add(new CoreTeamItem("Dr. Hemant Kumar Vinayak","Faculty Co-coordinator",BASE_URL_CORE + "hemant.jpg"));
array_list.add(new CoreTeamItem("Dr. Venu Shree","Faculty Co-coordinator",BASE_URL_CORE + "venu.jpg"));

array_list.add(new CoreTeamItem("Sahil Garg","Secretary (Technical Activities)", BASE_URL_CORE + "sahil.jpg"));
array_list.add(new CoreTeamItem("Rohit Panjla","Secretary (Finance & Treasury)", BASE_URL_CORE + "rohit_panjla.jpg"));
array_list.add(new CoreTeamItem("Mukesh Kumar Kharita","Secretary (Web/App/Registration)", BASE_URL_CORE + "mukesh_kharita.jpg"));
array_list.add(new CoreTeamItem("Jatin Dogra","Secretary (Accommodation & Hospitality)", BASE_URL_CORE + "jatin_dogra.jpg"));
array_list.add(new CoreTeamItem("Abhishek Kapoor","Secretary (Design & Deco)", BASE_URL_CORE + "abhishek.jpg"));


// OLD LIST NIMBUS 2k17
// array_list.add(new CoreTeamItem("Abhinav Anand","Secretary (Technical Activities)",BASE_URL_JSEC+"abhinav.jpg"));
// array_list.add(new CoreTeamItem("Pranav Bhardwaj","Club Secretary (Core)",BASE_URL_JSEC+"pranav.jpg"));
// array_list.add(new CoreTeamItem("Harsh Sharma","Club Secretary (Departmental)",BASE_URL_JSEC+"harsh.jpg"));
// array_list.add(new CoreTeamItem("Harshit Nadda","Secretary (Finance and treasury)",BASE_URL_JSEC+"harshit.jpg"));
// array_list.add(new CoreTeamItem("Rohit Raman","Secretary (Finance and treasury)",BASE_URL_JSEC+"rohit.jpg"));
// array_list.add(new CoreTeamItem("Pooja Bayana","Secretary (Public Relation)",BASE_URL_JSEC+"pooja.jpg"));
// array_list.add(new CoreTeamItem("Himanshu Khandelwal","Jt. Secretary (Public Relation)",BASE_URL_JSEC+"himanshu.jpg"));
// array_list.add(new CoreTeamItem("Ishan Dhiman","Creative Head",BASE_URL_JSEC+"ishan.jpg"));
// array_list.add(new CoreTeamItem("Shubam Rana","Graphic Head",BASE_URL_JSEC+"shubam.jpg"));
// array_list.add(new CoreTeamItem("Saloni Bakshi","Web Head",BASE_URL_JSEC+"saloni.jpg"));
// array_list.add(new CoreTeamItem("Chetanya Kaushal","Secretary (Hospitality)",BASE_URL+"chetanya.jpg"));
// array_list.add(new CoreTeamItem("Abhisek Mehra","Secretary (Registration)",BASE_URL_JSEC+"abhishekm.jpg"));
// array_list.add(new CoreTeamItem("Abhishek Singh Parihar","Secretary (Accomodation)",BASE_URL_JSEC+"abhisheks.JPG"));
// array_list.add(new CoreTeamItem("Shubham Mahajan","Secretary (Transportation)",BASE_URL_JSEC+"shubham.jpg"));
// array_list.add(new CoreTeamItem("Nishant Chaudhary","Secretary (Promotional & Marketing)",BASE_URL_JSEC+"nishant.jpg"));
// array_list.add(new CoreTeamItem("Medisetti Tanuja","App Team Head",BASE_URL_JSEC+"medisetti.jpg"));
// array_list.add(new CoreTeamItem("Anurag Sharma","Event Quality Head",BASE_URL+"anurag.jpg"));
// array_list.add(new CoreTeamItem("Tushar joshi","Event Scheduling Manager",BASE_URL+"tushar.jpg"));
// array_list.add(new CoreTeamItem("Abhimanyu Kumar","Secretary (Design & Decoration)",BASE_URL_JSEC+"abhimanyu.jpg"));
// array_list.add(new CoreTeamItem("Chirag Tyagi","Secretary (Technical Decoration)",BASE_URL_JSEC+"chirag.jpg"));
// array_list.add(new CoreTeamItem("Sumit Kumar Singh","Jt. Secretary (Technical Decoration)",BASE_URL_JSEC+"sumit.jpg"));
// array_list.add(new CoreTeamItem("Aditya Verma","Secretary (Discipline (Boy))",BASE_URL_JSEC+"aditya.jpg"));
// array_list.add(new CoreTeamItem("Kunal Sharma","Jt. Secretary (Discipline (Boy))",BASE_URL_JSEC+"kunal.jpg"));
// array_list.add(new CoreTeamItem("Shriya Kaul","Secretary (Discipline (Girl))",BASE_URL_JSEC+"shriya.jpg"));
// array_list.add(new CoreTeamItem("Pranab Mukamia","Secretary (Environmental)",BASE_URL_JSEC+"pranab.jpg"));
// array_list.add(new CoreTeamItem("Rajat Dohroo","Secretary (Human Value & Ethics)",BASE_URL_JSEC+"rajat.jpg"));


core_team_adapter=new CoreTeamAdapter(array_list,CoreTeamActivity.this);
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/com/nith/appteam/nimbus/Activity/HomescreenNew.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,13 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {

switch (menuItem.getItemId()) {
case R.id.nav_aboutapp:
AlertDialog.Builder alertDialog = new AlertDialog.Builder(HomescreenNew.this);
alertDialog.setTitle("About App");

alertDialog.setMessage("\nThe Official Android App for 'Nimbus 2k18', the Annual Technical Fest of NIT Hamirpur developed by App Team-NITH\n\n");
alertDialog.setIcon(R.drawable.nimbuslogo);
alertDialog.show();
// AlertDialog.Builder alertDialog = new AlertDialog.Builder(HomescreenNew.this);
// alertDialog.setTitle("About App");
//
// alertDialog.setMessage("\nThe Official Android App for 'Nimbus 2k18', the Annual Technical Fest of NIT Hamirpur developed by App Team-NITH\n\n");
// alertDialog.setIcon(R.drawable.nimbuslogo);
// alertDialog.show();
startActivity(new Intent(HomescreenNew.this,AboutActivity.class));
drawer.closeDrawers();
return true;
case R.id.nav_team:
Expand Down Expand Up @@ -388,12 +389,11 @@ public void onClick(DialogInterface dialog, int which) {

alertDialog3.setTitle("Phone Number\n\n");

CharSequence name[] = {"Abhinav Anand: 9816291592", "Pranav Bhardwaj: 9882551107"};
CharSequence name[] = {"Sahil Garg: 9882209522", "Jatin Dogra: 8894608213"};

alertDialog3.setItems(name, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface di, int i) {

call(i);
}
});
Expand Down
24 changes: 17 additions & 7 deletions app/src/main/java/com/nith/appteam/nimbus/Activity/ProfileActivityEdit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ProgressBar;
import android.widget.Spinner;
import android.widget.Toast;

Expand All @@ -34,6 +35,7 @@ public class ProfileActivityEdit extends AppCompatActivity {
private SharedPref sharedPref;
private Spinner spinner;
private Toolbar toolbar;
private ProgressBar progressBar;
Boolean flag_year = false;

@Override
Expand All @@ -51,6 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
email = (EditText) findViewById(R.id.email);
spinner = (Spinner) findViewById(R.id.spinner);
toolbar = (Toolbar) findViewById(R.id.pe_toolbar);
progressBar = findViewById(R.id.profile_progress);

setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Expand All @@ -73,15 +76,19 @@ protected void onCreate(Bundle savedInstanceState) {
submit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!firstName.getText().toString().isEmpty() && !rollNo.getText().toString().isEmpty() && !branch.getText().toString().isEmpty() && !email.getText().toString().isEmpty()) {
if (isValidEmail(email.getText().toString())) {
setData();

if (!firstName.getText().toString().isEmpty() && !rollNo.getText().toString().isEmpty() && !branch.getText().toString().isEmpty() && !email.getText().toString().isEmpty()) {
if (isValidEmail(email.getText().toString())) {
submit.setVisibility(View.GONE);
progressBar.setVisibility(View.VISIBLE);
setData();
} else {
Toast.makeText(ProfileActivityEdit.this, "Enter Correct email address", Toast.LENGTH_LONG).show();
}
} else {
Toast.makeText(ProfileActivityEdit.this, "Enter Correct email address", Toast.LENGTH_LONG).show();
Toast.makeText(ProfileActivityEdit.this, "Enter All Details", Toast.LENGTH_LONG).show();
}
} else {
Toast.makeText(ProfileActivityEdit.this, "Enter All Details", Toast.LENGTH_LONG).show();
}


}
});
Expand All @@ -104,12 +111,15 @@ public void onResponse(Call<ProfileResponse> call, Response<ProfileResponse> res
} else {
Toast.makeText(ProfileActivityEdit.this, "Try Again", Toast.LENGTH_SHORT).show();
}
progressBar.setVisibility(View.GONE);
submit.setVisibility(View.VISIBLE);
}
}

@Override
public void onFailure(Call<ProfileResponse> call, Throwable t) {
Toast.makeText(ProfileActivityEdit.this, "Try Again", Toast.LENGTH_SHORT).show();
submit.setVisibility(View.VISIBLE);
}
});
}
Expand Down
Loading

0 comments on commit a6ea91f

Please sign in to comment.