-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #52 from RamolaWeb/master
Finished First Version
- Loading branch information
Showing
36 changed files
with
233 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,9 +54,7 @@ public class MainActivity extends AppCompatActivity { | |
| private ImageView imgNavHeaderBg, imgProfile; | ||
| private TextView txtName, txtSubName; | ||
| Toolbar toolbar; | ||
| private LinearLayout quiz_layout, gallery_layout, | ||
| map_layout, newsfeed_layout, coreteam_layout , | ||
| aboutnimbus_layout , teams_layout, feedback_layout; | ||
| private LinearLayout quiz_layout, gallery_layout, map_layout, newsfeed_layout, coreteam_layout , aboutnimbus_layout , teams_layout, feedback_layout,sponsor_layout,workshop_layout,contributor_layout; | ||
|
|
||
| //public static int navItemIndex = 0; | ||
|
|
||
|
|
@@ -139,7 +137,9 @@ public void init(){ | |
| aboutnimbus_layout= (LinearLayout) findViewById(R.id.aboutnimbus_layout); | ||
| teams_layout= (LinearLayout) findViewById(R.id.teams_layout); | ||
| feedback_layout= (LinearLayout) findViewById(R.id.feedback_layout); | ||
|
|
||
| contributor_layout= (LinearLayout) findViewById(R.id.contributor_layout); | ||
| sponsor_layout= (LinearLayout) findViewById(R.id.sponsor_layout); | ||
| workshop_layout= (LinearLayout) findViewById(R.id.workshop_layout); | ||
| bottomNavigationView= (BottomNavigationView) findViewById(R.id.bottom_navigation); | ||
|
|
||
| } | ||
|
|
@@ -155,14 +155,14 @@ public void onClick(View v) { | |
| gallery_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
|
|
||
| startActivity(new Intent(MainActivity.this,GalleryActivity.class)); | ||
| } | ||
| }); | ||
|
|
||
| map_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
|
|
||
| startActivity(new Intent(MainActivity.this,MapActivity.class)); | ||
| } | ||
| }); | ||
|
|
||
|
|
@@ -176,28 +176,53 @@ public void onClick(View v) { | |
| coreteam_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| startActivity(new Intent(MainActivity.this,TeamActivity.class)); | ||
| startActivity(new Intent(MainActivity.this,CoreTeamActivity.class)); | ||
| } | ||
| }); | ||
|
|
||
| aboutnimbus_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
|
|
||
| startActivity(new Intent(MainActivity.this,AboutActivity.class)); | ||
| } | ||
| }); | ||
|
|
||
| teams_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
|
|
||
| startActivity(new Intent(MainActivity.this,TeamActivity.class)); | ||
| } | ||
| }); | ||
|
|
||
| feedback_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| Intent intent = new Intent(Intent.ACTION_SENDTO); | ||
| String uriText = "mailto:" + Uri.encode("[email protected]") + "?subject=" + Uri.encode("Reporting A Bug/Feedback") + "&body=" + Uri.encode("Hello, \nI want to report a bug/give feedback corresponding to the app Nimbus App.\n.....\n\n-Your name"); | ||
| Uri uri = Uri.parse(uriText); | ||
| intent.setData(uri); | ||
| startActivity(Intent.createChooser(intent, "Send Email")); | ||
| } | ||
| }); | ||
|
|
||
| workshop_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| startActivity(new Intent(MainActivity.this,Workshops.class)); | ||
| } | ||
| }); | ||
|
|
||
| sponsor_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| startActivity(new Intent(MainActivity.this,SponsorActivity.class)); | ||
| } | ||
| }); | ||
|
|
||
| contributor_layout.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| startActivity(new Intent(MainActivity.this,ContributorsActivity.class)); | ||
| } | ||
| }); | ||
|
|
||
|
|
@@ -278,11 +303,6 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { | |
| alertDialog.show(); | ||
| drawer.closeDrawers(); | ||
| return true; | ||
| case R.id.nav_settings: | ||
| //navItemIndex = 2; | ||
| //startActivity(new Intent(MainActivity.this, XYZ.class)); | ||
| drawer.closeDrawers(); | ||
| return true; | ||
| case R.id.nav_team: | ||
| startActivity(new Intent(MainActivity.this, ContributorsActivity.class)); | ||
| drawer.closeDrawers(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.