Skip to content

Bug fixed #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug fixed #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,38 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".ContactUsActivity"
android:label="Contact Us"
android:parentActivityName=".MainActivity">
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity android:name=".AboutIeeeMsit"
android:label="About Ieee MSIT"
android:parentActivityName=".MainActivity">
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity android:name=".BranchAdvisorsActivity"
android:label="Branch Advisors"
android:parentActivityName=".MainActivity">
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity android:name=".AndroidTeamActivity"
android:label="Android Team"
android:parentActivityName=".MainActivity">
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
</application>

</manifest>
8 changes: 4 additions & 4 deletions app/src/main/java/in/msit/ieee/BranchAdvisorsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {

final ArrayList<BranchAdvisors> branchAdvisors = new ArrayList<BranchAdvisors>();

branchAdvisors.add(new BranchAdvisors(R.drawable.ieee_msit,"Mr. Sitender","Branch Counselor, IEEE MSIT","[email protected]"));
branchAdvisors.add(new BranchAdvisors(R.drawable.ieee_msit,"Ms. Savita Ahlawat","Chapter Advisor, IEEE CS MSIT","[email protected]"));
branchAdvisors.add(new BranchAdvisors(R.drawable.ieee_msit,"Mr. Parveen Kumar","Chapter Advisor, IEEE MTT-S MSIT","[email protected]"));
branchAdvisors.add(new BranchAdvisors(R.drawable.ieee_msit,"Ms. Jyoti Jain","Chapter Advisor, IEEE PES MSIT","[email protected]"));
branchAdvisors.add(new BranchAdvisors(R.drawable.counselor,"Mr. Sitender","Branch Counselor, IEEE MSIT","[email protected]"));
branchAdvisors.add(new BranchAdvisors(R.drawable.cs_chapter,"Ms. Savita Ahlawat","Chapter Advisor, IEEE CS MSIT","[email protected]"));
branchAdvisors.add(new BranchAdvisors(R.drawable.mtts_advisor,"Mr. Parveen Kumar","Chapter Advisor, IEEE MTT-S MSIT","[email protected]"));
branchAdvisors.add(new BranchAdvisors(R.drawable.pes_advisor,"Ms. Jyoti Jain","Chapter Advisor, IEEE PES MSIT","[email protected]"));

BranchAdvisorsAdapter branchAdvisorsAdapter= new BranchAdvisorsAdapter(this,branchAdvisors);

Expand Down
Binary file added app/src/main/res/drawable/counselor.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/cs_chapter.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/mtts_advisor.JPG
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/pes_advisor.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,7 @@
android:orientation="vertical"
tools:context="in.msit.ieee.MainActivity">

<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:id="@+id/contacts"
android:layout_width="match_parent"
android:text="Contact Us"
android:textSize="20sp"
android:layout_height="60dp"/>
</FrameLayout>

<FrameLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -52,6 +42,17 @@
android:text="Android Team"
android:layout_height="60dp"
android:textSize="20sp"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:id="@+id/contacts"
android:layout_width="match_parent"
android:text="Contact Us"
android:textSize="20sp"
android:layout_height="60dp"/>
</FrameLayout>


</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/branch_advisors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:layout_width="85dp"
android:layout_height="85dp"
android:id="@+id/branch_advisors_image"
android:src="@drawable/ieee_msit"/>
tools:src="@drawable/ieee_msit"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/layout/contacts_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
>
android:padding="16dp">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/contact_name"
android:gravity="center"
tools:text="IEEE MSIT Student Branch"/>
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:id="@+id/contact_email"
tools:text="[email protected]"/>

Expand Down