Skip to content

Commit

Permalink
Login Layout Modified, Project Sync
Browse files Browse the repository at this point in the history
  • Loading branch information
mnprtpsingh committed Mar 13, 2017
2 parents 8989acb + 0499b87 commit ddf1ba8
Show file tree
Hide file tree
Showing 90 changed files with 1,820 additions and 399 deletions.
12 changes: 4 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.1"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.appteam.nith.nimbus"
minSdkVersion 15
Expand All @@ -12,8 +12,8 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

manifestPlaceholders = [manifestApplicationId : "${applicationId}",
onesignal_app_id : "94a38ed3-22d3-4067-bf72-83ab26cea1ab",
onesignal_google_project_number: "28303056497"]
onesignal_app_id : "bc7ba5e0-7da9-4655-896a-7adcc1b967c5",
onesignal_google_project_number: "1049024080842"]
}
buildTypes {
release {
Expand All @@ -25,10 +25,6 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.facebook.android:facebook-android-sdk:4.+'
compile 'com.android.support:appcompat-v7:25.0.1'
Expand All @@ -52,4 +48,4 @@ dependencies {
compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
compile 'com.github.florent37:materialleanback:1.0.2'
compile 'com.nineoldandroids:library:2.4.0'
}
}
28 changes: 27 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@
android:name=".Activity.QuizActivity"
android:theme="@style/AppTheme.NoActionBar" />

<activity
android:name=".Activity.AboutActivity"
android:label="@string/title_activity_about"
android:theme="@style/AppTheme"></activity>

<activity android:name=".Activity.GalleryDetailActivity" />
<activity android:name=".Activity.GalleryActivity" >
<meta-data
Expand All @@ -137,6 +142,27 @@
</activity>

<activity android:name=".Notification.NotificationActivity"></activity>

<activity android:name=".Notification.Notification2"
android:parentActivityName=".Notification.NotificationActivity"/>

<activity
android:name=".Activity.ContributorsActivity"
android:parentActivityName=".Activity.MainActivity">
</activity>

<activity android:name=".Activity.QuizQuestionActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.nith.appteam.nimbus.Activity.QuizActivity" />
</activity>

<activity android:name=".Activity.InformationActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.nith.appteam.nimbus.Activity.QuizActivity" />
</activity>

</application>

</manifest>
</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@

package com.nith.appteam.nimbus.Activity;

import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;

import com.nith.appteam.nimbus.R;


public class AboutActivity extends AppCompatActivity {

private Toolbar toolbar;


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
initCollapsingToolbar();
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

}

private void initCollapsingToolbar() {
final CollapsingToolbarLayout collapsingToolbar =
(CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar);
collapsingToolbar.setTitle(" ");
AppBarLayout appBarLayout = (AppBarLayout) findViewById(R.id.appbar);
appBarLayout.setExpanded(true);

// hiding & showing the title when toolbar expanded & collapsed
appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
boolean isShow = false;
int scrollRange = -1;

@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
if (scrollRange == -1) {
scrollRange = appBarLayout.getTotalScrollRange();
}
if (scrollRange + verticalOffset == 0) {
collapsingToolbar.setTitle("About Nimbus");
isShow = true;
} else if (isShow) {
collapsingToolbar.setTitle(" ");
isShow = false;
}
}
});
}



}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package com.nith.appteam.nimbus.Activity;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;

import com.nith.appteam.nimbus.Adapter.contributorsAdapter;
import com.nith.appteam.nimbus.Model.contributorsItem;
import com.nith.appteam.nimbus.R;

import java.util.ArrayList;

public class ContributorsActivity extends AppCompatActivity {

RecyclerView rvContributors;
contributorsAdapter ContributorAdapter;
Toolbar tbContributers;
ArrayList<contributorsItem> contributorsItems;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_contributors);

String BASE_URL = "https://github.com/";
rvContributors = (RecyclerView) findViewById(R.id.contributors_view);

contributorsItems = new ArrayList<>();
contributorsItems.add(new contributorsItem("Tanuja Medisetti", BASE_URL + "TanujaMedisetti87.png" , BASE_URL + "TanujaMedisetti87"));
contributorsItems.add(new contributorsItem("Nishant Chaudhary", BASE_URL + "nishant23j.png", BASE_URL + "nishant23j"));
contributorsItems.add(new contributorsItem("Shubham Naik", BASE_URL + "nrshubham.png", BASE_URL + "nrshubham"));
contributorsItems.add(new contributorsItem("Ashima Anand", BASE_URL + "ashima1795.png", BASE_URL + "ashima1795"));

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

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"));
contributorsItems.add(new contributorsItem("Jalaz Kumar", BASE_URL + "jaykay12.png", BASE_URL + "jaykay12"));
contributorsItems.add(new contributorsItem("Narendra Dodwaria", BASE_URL + "narendra36.png", BASE_URL + "narendra36"));
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"));
contributorsItems.add(new contributorsItem("Aditya Arora", BASE_URL + "adi23arora.png",BASE_URL + "adi23arora"));
//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"));
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"));

ContributorAdapter = new contributorsAdapter(contributorsItems, ContributorsActivity.this);
rvContributors.setAdapter(ContributorAdapter);

tbContributers = (Toolbar) findViewById(R.id.contributors_toolbar);
tbContributers.setTitle("Contributors");
setSupportActionBar(tbContributers);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

LinearLayoutManager lvmanager = new LinearLayoutManager(this);
lvmanager.setOrientation(LinearLayoutManager.VERTICAL);
rvContributors.setLayoutManager(lvmanager);

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,32 @@ protected void onCreate(Bundle savedInstanceState) {
array_list.add(new CoreTeamItem("Dr. A.S. Singha","Dean Student Welfare",BASE_URL+"photos/as.jpg"));
array_list.add(new CoreTeamItem("Dr. Surender Soni","Faculty Coordinator","https://s3-ap-southeast-1.amazonaws.com/nimbus2k16/nimbusteam/surender_soni.png"));

array_list.add(new CoreTeamItem("Abhinav Anand","Nimbus Secretary",BASE_URL_JSEC+"sec_cultural.jpg"));
array_list.add(new CoreTeamItem("Pranav Bhardwaj","Clubs Secretary (Core)",BASE_URL_JSEC+"sec_club.jpg"));
array_list.add(new CoreTeamItem("Harsh Sharma","Clubs Secretary (Departmental)",BASE_URL_JSEC+"sec_club.jpg"));
array_list.add(new CoreTeamItem("Harshiit Nadda","Finance Secretary",BASE_URL_JSEC+"sec_finance.jpg"));
array_list.add(new CoreTeamItem("Rohit Raman","Treasurer",BASE_URL_JSEC+"treasurer.jpg"));
array_list.add(new CoreTeamItem("Pooja Bayana","Secretary (Public Relation)",BASE_URL_JSEC+"jsec_web.jpg"));
array_list.add(new CoreTeamItem("Himanshu Khandelwal","Jt. Secretary (Public Relation)",BASE_URL_JSEC+"jsec_dramatics.jpg"));
array_list.add(new CoreTeamItem("Ishan Dhiman","Creative Head",BASE_URL_JSEC+"jsec_creative.jpg"));
array_list.add(new CoreTeamItem("Shubam Rana","Graphic Head",BASE_URL_JSEC+"jsec_graphics.jpg"));
array_list.add(new CoreTeamItem("Saloni Bakshi","Web Head",BASE_URL_JSEC+"jsec_graphics.jpg"));
array_list.add(new CoreTeamItem("Chetanya Kaushal","Secretary (Hospitality)",BASE_URL+"photos/bhanu_pratap.jpg"));
array_list.add(new CoreTeamItem("Abhisek Mehra","Jt. Secretary (Registration)",BASE_URL_JSEC+"jsec_pr.jpg"));
array_list.add(new CoreTeamItem("Abhishek Singh Parihar","Secretary (Accomodation)",BASE_URL_JSEC+"jsec_dance.jpg"));
array_list.add(new CoreTeamItem("Shubham Mahajan","Secretary (Transportation)",BASE_URL_JSEC+"jsec_dance.jpg"));
array_list.add(new CoreTeamItem("Nishant Chaudhary","Secretary (Promotional & Marketing)",BASE_URL_JSEC+"jsec_dance.jpg"));
array_list.add(new CoreTeamItem("Medisetti Tanuja","App Team Head",BASE_URL_JSEC+"jsec_app.jpg"));
array_list.add(new CoreTeamItem("Anurag Sharma","Event Quality Head",BASE_URL+"photos/aanchal_negi.jpg"));
array_list.add(new CoreTeamItem("Tushar joshi","Event Scheduling Manager",BASE_URL+"photos/aditya_verma.jpg"));
array_list.add(new CoreTeamItem("Abhimanyu Kumar","Secretary (Design & Decoration)",BASE_URL_JSEC+"jsec_organisation.jpg"));
array_list.add(new CoreTeamItem("Chirag Tyagi","Secretary (Technical Decoration)",BASE_URL_JSEC+"jsec_technical.jpg"));
array_list.add(new CoreTeamItem("Sumit Kumar Singh","Jt. Secretary (Technical Decoration)",BASE_URL_JSEC+"convener_ins.jpg"));
array_list.add(new CoreTeamItem("Aditya Verma","Secretary (Discipline (Boy))",BASE_URL_JSEC+"convener_ins.jpg"));
array_list.add(new CoreTeamItem("Kunal Sharma","Jt. Secretary (Discipline (Boy))",BASE_URL_JSEC+"convener_ins.jpg"));
array_list.add(new CoreTeamItem("Shriya Kaul","Secretary (Discipline (Girl))",BASE_URL_JSEC+"convener_ins.jpg"));
array_list.add(new CoreTeamItem("Pranab Mukamia","Secretary (Environmental)",BASE_URL_JSEC+"convener_ins.jpg"));
array_list.add(new CoreTeamItem("Rajat Dohroo","Secretary (Human Value & Ethics)",BASE_URL_JSEC+"convener_ins.jpg"));
array_list.add(new CoreTeamItem("Abhinav Anand","Nimbus Secretary",BASE_URL_JSEC+"abhinav.jpg"));
array_list.add(new CoreTeamItem("Pranav Bhardwaj","Clubs Secretary (Core)",BASE_URL_JSEC+"pranav.jpg"));
array_list.add(new CoreTeamItem("Harsh Sharma","Clubs Secretary (Departmental)",BASE_URL_JSEC+"harsh.jpg"));
array_list.add(new CoreTeamItem("Harshit Nadda","Finance Secretary",BASE_URL_JSEC+"harshit.jpg"));
array_list.add(new CoreTeamItem("Rohit Raman","Treasurer",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","Jt. 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.nith.appteam.nimbus.Activity;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.Button;

import com.nith.appteam.nimbus.R;

public class InformationActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_information);

Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
}
Loading

0 comments on commit ddf1ba8

Please sign in to comment.