diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/ContributorsActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/ContributorsActivity.java index 688af9c..db76a43 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/ContributorsActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/ContributorsActivity.java @@ -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")); @@ -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); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/CoreTeamActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/CoreTeamActivity.java index 8990b9d..7456e3c 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/CoreTeamActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/CoreTeamActivity.java @@ -18,8 +18,10 @@ public class CoreTeamActivity extends AppCompatActivity { CoreTeamAdapter core_team_adapter; ArrayList 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) { @@ -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); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/HomescreenNew.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/HomescreenNew.java index 1b5cf59..73639ff 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/HomescreenNew.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/HomescreenNew.java @@ -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: @@ -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); } }); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/ProfileActivityEdit.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/ProfileActivityEdit.java index 66463cd..27c3e2f 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/ProfileActivityEdit.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/ProfileActivityEdit.java @@ -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; @@ -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 @@ -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); @@ -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(); - } + } }); @@ -104,12 +111,15 @@ public void onResponse(Call call, Response 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 call, Throwable t) { Toast.makeText(ProfileActivityEdit.this, "Try Again", Toast.LENGTH_SHORT).show(); + submit.setVisibility(View.VISIBLE); } }); } diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/RegisterEvent.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/RegisterEvent.java index 0bc984d..ea92eee 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/RegisterEvent.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/RegisterEvent.java @@ -37,7 +37,7 @@ import retrofit2.Response; public class RegisterEvent extends AppCompatActivity { - private String name,imgUrl,description; + private String name, imgUrl, description; private Boolean registerStatus; private Button registerButtton; @@ -57,19 +57,22 @@ public class RegisterEvent extends AppCompatActivity { private ProgressBar progressBar; private LinearLayout linearLayout; private ProgressBar progressBar_register; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_register_event); - Toolbar toolbar= (Toolbar) findViewById(R.id.toolbar); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); + sharedPref = new SharedPref(this); - coordinatorLayout= (CoordinatorLayout) findViewById(R.id.core_view); + coordinatorLayout = (CoordinatorLayout) findViewById(R.id.core_view); registerButtton = findViewById(R.id.register_button); - cardView1 = (CardView)findViewById(R.id.cardTimings); - cardView2 = (CardView)findViewById(R.id.desc_event); + cardView1 = (CardView) findViewById(R.id.cardTimings); + cardView2 = (CardView) findViewById(R.id.desc_event); collapsingToolbarLayout = findViewById(R.id.collapsing_toolbar); final LinearLayout time = (LinearLayout) findViewById(R.id.time_detail); final LinearLayout about = (LinearLayout) findViewById(R.id.event_description); @@ -84,12 +87,12 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onClick(View view) { - if(!showCompleteTiming){ + if (!showCompleteTiming) { time.setVisibility(View.VISIBLE); - showCompleteTiming=true; - }else{ + showCompleteTiming = true; + } else { time.setVisibility(View.GONE); - showCompleteTiming=false; + showCompleteTiming = false; } } }); @@ -97,10 +100,10 @@ public void onClick(View view) { @Override public void onClick(View view) { - if(!showCompleteInfo){ + if (!showCompleteInfo) { about.setVisibility(View.VISIBLE); showCompleteInfo = true; - }else{ + } else { about.setVisibility(View.GONE); showCompleteInfo = false; } @@ -109,11 +112,11 @@ public void onClick(View view) { registerButtton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if(!sharedPref.getLoginStatus()){ - startActivity(new Intent(RegisterEvent.this,FirebaseLoginActivity.class)); + if (!sharedPref.getLoginStatus()) { + startActivity(new Intent(RegisterEvent.this, FirebaseLoginActivity.class)); } - if(!sharedPref.isDataFilled()) { - Log.d("gg","hhh"); + if (!sharedPref.isDataFilled()) { + Log.d("gg", "hhh"); startActivity(new Intent(RegisterEvent.this, ProfileActivityEdit.class)); } registerButtton.setVisibility(View.GONE); @@ -123,48 +126,43 @@ public void onClick(View v) { }); getDetails(); } - public void getDetails(){ - ApiInterface apiservice= Util.getRetrofitService(); - if(sharedPref.getUserId().isEmpty()){ + + public void getDetails() { + ApiInterface apiservice = Util.getRetrofitService(); + if (sharedPref.getUserId().isEmpty()) { progressBar.setVisibility(View.GONE); - Snackbar.make(coordinatorLayout,"Please Login To See The Content",Snackbar.LENGTH_INDEFINITE).setAction("Login", new View.OnClickListener() { + Snackbar.make(coordinatorLayout, "Please Login To See The Content", Snackbar.LENGTH_INDEFINITE).setAction("Login", new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(RegisterEvent.this,FirebaseLoginActivity.class)); + startActivity(new Intent(RegisterEvent.this, FirebaseLoginActivity.class)); } }).show(); } - Call call=apiservice.getEventDetail(getIntent().getStringExtra("id"),sharedPref.getUserId()); + Call call = apiservice.getEventDetail(getIntent().getStringExtra("id"), sharedPref.getUserId()); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - if(response.isSuccess()) - { - SingleWorkshopResponse model=response.body(); - if(model!=null) - { + if (response.isSuccess()) { + SingleWorkshopResponse model = response.body(); + if (model != null) { linearLayout.setVisibility(View.VISIBLE); describe.setText(model.getDesc()); + timings.setText(model.getEventDate()); collapsingToolbarLayout.setTitle(model.getName()); Glide.with(RegisterEvent.this).load(model.getImgUrl()).diskCacheStrategy(DiskCacheStrategy.ALL).into(img); - if(model.getRegStatus()) - { + if (model.getRegStatus()) { registerButtton.setVisibility(View.GONE); reg_status.setVisibility(View.VISIBLE); reg_status.setText("User Already registered"); progressBar.setVisibility(View.GONE); - } - else { + } else { registerButtton.setVisibility(View.VISIBLE); progressBar.setVisibility(View.GONE); } - } - else{ + } else { progressBar.setVisibility(View.GONE); } - } - else - { + } else { progressBar.setVisibility(View.GONE); Toast.makeText(RegisterEvent.this, "Error please try again", Toast.LENGTH_SHORT).show(); } @@ -178,10 +176,11 @@ public void onFailure(Call call, Throwable t) { } }); } - public void registerRetrofit(){ - ApiInterface apiservice= Util.getRetrofitService(); - Call call=apiservice.getEventRegisterResponse(getIntent().getStringExtra("id"),sharedPref.getUserId()); + public void registerRetrofit() { + ApiInterface apiservice = Util.getRetrofitService(); + + Call call = apiservice.getEventRegisterResponse(getIntent().getStringExtra("id"), sharedPref.getUserId()); call.enqueue(new Callback() { @Override @@ -190,11 +189,11 @@ public void onResponse(Call call, Response call, Response call, Throwable t) { progressBar_register.setVisibility(View.GONE); - Toast.makeText(RegisterEvent.this,"Some error occurred!!",Toast.LENGTH_SHORT).show(); + Toast.makeText(RegisterEvent.this, "Some error occurred!!", Toast.LENGTH_SHORT).show(); } }); } diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamActivity.java index 63640de..cd53bcd 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamActivity.java @@ -27,51 +27,54 @@ import retrofit2.Response; public class TeamActivity extends AppCompatActivity { - private ViewPager viewPager,viewPager2; + private ViewPager viewPager, viewPager2; private TeamFragmentPagerAdapter adapter; private CoreTeamActivityAdapter adapter2; private ProgressBar progressBar; - private TextView message,textcore,textdept; + private TextView message, textcore, textdept; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_team); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - viewPager= (ViewPager) findViewById(R.id.pager); - viewPager2= (ViewPager) findViewById(R.id.pager2); - progressBar= (ProgressBar) findViewById(R.id.progressbar); - message= (TextView) findViewById(R.id.message_textView); - textcore=(TextView) findViewById(R.id.textcoreteam); - textdept=(TextView) findViewById(R.id.textdeptteam); + getSupportActionBar().setTitle("Teams"); + + viewPager = (ViewPager) findViewById(R.id.pager); + viewPager2 = (ViewPager) findViewById(R.id.pager2); + progressBar = (ProgressBar) findViewById(R.id.progressbar); + message = (TextView) findViewById(R.id.message_textView); + textcore = (TextView) findViewById(R.id.textcoreteam); + textdept = (TextView) findViewById(R.id.textdeptteam); viewPager.setPageMargin(5); getAllCoreTeamList(); getAllTeamList(); } - private void getAllTeamList(){ + private void getAllTeamList() { progressBar.setVisibility(View.VISIBLE); - if(new Connection(this).isInternet()){ - Call call= Util.getRetrofitService().getAllTeam(); + if (new Connection(this).isInternet()) { + Call call = Util.getRetrofitService().getAllTeam(); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - if(response!=null&&response.isSuccess()){ - ArrayList list=response.body().getTeamList(); - adapter=new TeamFragmentPagerAdapter(getSupportFragmentManager(),2f,list); + if (response != null && response.isSuccess()) { + ArrayList list = response.body().getTeamList(); + adapter = new TeamFragmentPagerAdapter(getSupportFragmentManager(), 2f, list); viewPager.setAdapter(adapter); - ShadowTransformer shadowTransformer=new ShadowTransformer(viewPager,adapter); - viewPager.setPageTransformer(false,shadowTransformer); + ShadowTransformer shadowTransformer = new ShadowTransformer(viewPager, adapter); + viewPager.setPageTransformer(false, shadowTransformer); viewPager.setOffscreenPageLimit(3); progressBar.setVisibility(View.GONE); viewPager.setVisibility(View.VISIBLE); message.setVisibility(View.GONE); textdept.setVisibility(View.VISIBLE); - } - else { + } else { message.setVisibility(View.VISIBLE); message.setText("Please Check Your Internet Connection"); progressBar.setVisibility(View.GONE); @@ -87,32 +90,33 @@ public void onFailure(Call call, Throwable t) { progressBar.setVisibility(View.GONE); } }); - } - else{ + } else { message.setVisibility(View.VISIBLE); message.setText("Please Check Your Internet Connection"); progressBar.setVisibility(View.GONE); } } - private void getAllCoreTeamList(){ - if(new Connection(this).isInternet()){ - Call call= Util.getRetrofitService().getAllCoreTeam(); + + private void getAllCoreTeamList() { + if (new Connection(this).isInternet()) { + Call call = Util.getRetrofitService().getAllCoreTeam(); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - if(response!=null&&response.isSuccess()){ - ArrayList list=response.body().getCoreTeams(); - Log.e("TteamACtivity","CoreTeamName:"+list.get(0).getName()); - adapter2=new CoreTeamActivityAdapter(getSupportFragmentManager(),2f,list); + if (response != null && response.isSuccess()) { + ArrayList list = response.body().getCoreTeams(); + Log.e("TteamACtivity", "CoreTeamName:" + list.get(0).getName()); + adapter2 = new CoreTeamActivityAdapter(getSupportFragmentManager(), 2f, list); viewPager2.setAdapter(adapter2); - ShadowTransformer shadowTransformer2=new ShadowTransformer(viewPager2,adapter2); - viewPager2.setPageTransformer(false,shadowTransformer2); + ShadowTransformer shadowTransformer2 = new ShadowTransformer(viewPager2, adapter2); + viewPager2.setPageTransformer(false, shadowTransformer2); viewPager2.setOffscreenPageLimit(3); viewPager2.setVisibility(View.VISIBLE); message.setVisibility(View.GONE); textcore.setVisibility(View.VISIBLE); } } + @Override public void onFailure(Call call, Throwable t) { t.printStackTrace(); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java index 50757c2..3154101 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java @@ -237,7 +237,7 @@ public void onResponse(Call call, Response respons headerTitle.setText(t.getName()); teamDescription.setText(t.getDesc()); Log.d("g",t.getLogo()); - Glide.with(TeamEventActivity.this).load(t.getBanner()).diskCacheStrategy(DiskCacheStrategy.ALL).placeholder(R.drawable.nimbuslogo).into(bannerImage); +// Glide.with(TeamEventActivity.this).load(t.getBanner()).diskCacheStrategy(DiskCacheStrategy.ALL).placeholder(R.drawable.nimbuslogo).into(bannerImage); Glide.with(TeamEventActivity.this).load(t.getLogo()).asBitmap().diskCacheStrategy(DiskCacheStrategy.ALL).error(R.drawable.placeholder).into(new ImageViewTarget(logoView) { @Override protected void setResource(Bitmap resource) { diff --git a/app/src/main/java/com/nith/appteam/nimbus/Fragment/TeamFragment.java b/app/src/main/java/com/nith/appteam/nimbus/Fragment/TeamFragment.java index afb428e..61c2c4f 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Fragment/TeamFragment.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Fragment/TeamFragment.java @@ -44,13 +44,14 @@ public TeamFragment() { private TextView teamNameTextView; private CardView cardview; private String teamId; - private boolean actCore=false; + private boolean actCore = false; + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); teamName = getArguments().getString(TEAM_NAME); teamPicUrl = getArguments().getString(TEAM_URL); - teamId=getArguments().getString(TEAM_ID); + teamId = getArguments().getString(TEAM_ID); } @Override @@ -58,22 +59,22 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment View v = inflater.inflate(R.layout.fragment_team, container, false); - cardview= (CardView) v.findViewById(R.id.cardview); + cardview = (CardView) v.findViewById(R.id.cardview); teamImageView = (ImageView) v.findViewById(R.id.image_team); teamNameTextView = (TextView) v.findViewById(R.id.text_name_team); teamNameTextView.setText(teamName); Glide.with(this).load(teamPicUrl).diskCacheStrategy(DiskCacheStrategy.ALL).placeholder(R.drawable.nimbuslogo).error(R.drawable.nimbuslogo).into(teamImageView); - cardview.setMaxCardElevation(cardview.getCardElevation()* TeamInterface.MAX_ELEVATION_FACTOR); - cardview.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent i; - if(!actCore)i=new Intent(getActivity(),TeamEventActivity.class); - else i=new Intent(getActivity(),CoreTeamEventActivity.class); - i.putExtra(TEAM_ID,teamId); - startActivity(i); - } - }); + cardview.setMaxCardElevation(cardview.getCardElevation() * TeamInterface.MAX_ELEVATION_FACTOR); + cardview.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent i; + if (!actCore) i = new Intent(getActivity(), TeamEventActivity.class); + else i = new Intent(getActivity(), CoreTeamEventActivity.class); + i.putExtra(TEAM_ID, teamId); + startActivity(i); + } + }); return v; } @@ -90,7 +91,7 @@ public static TeamFragment newInstance(TeamItem teamItem) { Bundle b = new Bundle(); b.putString(TEAM_NAME, teamItem.getName()); b.putString(TEAM_URL, teamItem.getUrl()); - b.putString(TEAM_ID,teamItem.getId()); + b.putString(TEAM_ID, teamItem.getId()); teamFragment.setArguments(b); return teamFragment; } @@ -101,12 +102,13 @@ public static TeamFragment newInstance(CoreTeam teamItem) { Bundle b = new Bundle(); b.putString(TEAM_NAME, teamItem.getName()); b.putString(TEAM_URL, teamItem.getLogo()); - b.putString(TEAM_ID,teamItem.getId()); - Log.e("Teamfragement","name:"+teamItem.getName()); - Log.e("Teamfragement","img:"+teamItem.getLogo()); + b.putString(TEAM_ID, teamItem.getId()); + Log.e("Teamfragement", "name:" + teamItem.getName()); + Log.e("Teamfragement", "img:" + teamItem.getLogo()); teamFragment.setArguments(b); return teamFragment; } + public CardView getCardview() { return cardview; } diff --git a/app/src/main/java/com/nith/appteam/nimbus/Model/SingleWorkshopResponse.java b/app/src/main/java/com/nith/appteam/nimbus/Model/SingleWorkshopResponse.java index 871dc86..541cf61 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Model/SingleWorkshopResponse.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Model/SingleWorkshopResponse.java @@ -19,6 +19,16 @@ public class SingleWorkshopResponse { String desc; @SerializedName("register_status") Boolean regStatus; + @SerializedName("event_date") + String eventDate; + + public String getEventDate() { + return eventDate; + } + + public void setEventDate(String eventDate) { + this.eventDate = eventDate; + } public Boolean getSuccessStatus() { return successStatus; diff --git a/app/src/main/res/layout/activity_profile_edit.xml b/app/src/main/res/layout/activity_profile_edit.xml index 194d266..3a20fab 100644 --- a/app/src/main/res/layout/activity_profile_edit.xml +++ b/app/src/main/res/layout/activity_profile_edit.xml @@ -194,20 +194,25 @@ android:layout_width="180dp" android:layout_height="wrap_content" android:layout_gravity="center" + android:foreground="?android:attr/selectableItemBackground" android:background="@color/colorAccent" android:textColor="#fff" android:layout_marginTop="20dp" android:text="Submit" /> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_register_event.xml b/app/src/main/res/layout/activity_register_event.xml index b4ef302..7558a2d 100644 --- a/app/src/main/res/layout/activity_register_event.xml +++ b/app/src/main/res/layout/activity_register_event.xml @@ -2,17 +2,19 @@ + + android:layout_gravity="center" + android:visibility="visible" /> + + android:src="@color/colorPrimary" + app:layout_collapseMode="parallax" /> - + layout="@layout/content_event_page" + android:visibility="invisible" /> diff --git a/app/src/main/res/layout/content_event_page.xml b/app/src/main/res/layout/content_event_page.xml index 0e2cf83..4c5368d 100644 --- a/app/src/main/res/layout/content_event_page.xml +++ b/app/src/main/res/layout/content_event_page.xml @@ -2,18 +2,17 @@ - > @@ -38,34 +37,22 @@ android:id="@+id/date_time" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="15dp" - android:text="Date of Event - 25/02/2018" - android:textSize="19dp" android:layout_marginHorizontal="15dp" android:paddingLeft="15dp" - /> - - + android:text="Date of Event - 25/02/2018" + android:textSize="19dp" /> - + - @@ -90,10 +77,10 @@ android:id="@+id/describe" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="15dp" android:padding="15dp" android:text="This Event is going to test your so and so skills, and in the end, we assure you, you'll be disappointed" - android:textSize="19dp" - android:layout_marginHorizontal="15dp"/> + android:textSize="19dp" /> @@ -102,38 +89,38 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:layout_marginBottom="25dp" + android:layout_marginTop="35dp" + android:width="270dp" android:background="@color/colorPrimary" android:fontFamily="casual" - android:width="270dp" android:text="Join the Event!" - android:visibility="gone" android:textColor="#efeaea" android:textSize="25sp" - android:layout_marginBottom="25dp" - android:layout_marginTop="35dp"/> + android:visibility="gone" /> + + android:layout_marginTop="35dp" + android:text="User Already registered" + android:textAllCaps="true" + android:textColor="#00c853" + android:textSize="15sp" + android:visibility="gone" /> + + android:visibility="gone" /> diff --git a/app/src/main/res/layout/content_team.xml b/app/src/main/res/layout/content_team.xml index 84f328a..e99b168 100644 --- a/app/src/main/res/layout/content_team.xml +++ b/app/src/main/res/layout/content_team.xml @@ -1,6 +1,5 @@ - + android:layout_height="match_parent"> + android:src="@drawable/logo_b_t" /> + - + - + /> - + - + /> + android:visibility="gone" /> + android:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_profiletab2.xml b/app/src/main/res/layout/fragment_profiletab2.xml index b3daf7c..63ca435 100644 --- a/app/src/main/res/layout/fragment_profiletab2.xml +++ b/app/src/main/res/layout/fragment_profiletab2.xml @@ -207,6 +207,7 @@ android:layout_centerHorizontal="true" android:layout_marginBottom="30dp" android:background="@color/colorAccent" + android:foreground="?android:attr/selectableItemBackground" android:textColor="#fff" android:gravity="center" android:text="Edit Profile" /> diff --git a/app/src/main/res/layout/fragment_team.xml b/app/src/main/res/layout/fragment_team.xml index bac8120..87a058b 100644 --- a/app/src/main/res/layout/fragment_team.xml +++ b/app/src/main/res/layout/fragment_team.xml @@ -20,12 +20,12 @@ android:padding="24dp"> + android:src="@drawable/cover" /> - + @@ -11,8 +11,9 @@ android:title="@string/nav_team" /> + android:id="@+id/nav_emergencycontact" + android:title="Emergency Contact" /> + @@ -20,10 +21,10 @@ + + android:id="@+id/nav_contactus" + android:title="@string/nav_contactus" />