Skip to content

Commit f97d64c

Browse files
committed
Integrated video activity with main app
1 parent 6dd9e09 commit f97d64c

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/iamzain/template_android/MainActivity.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.net.Uri;
88
import android.os.Bundle;
99
import android.preference.PreferenceManager;
10+
import android.provider.MediaStore;
1011
import android.support.v4.app.FragmentManager;
1112
import android.support.v4.app.FragmentTransaction;
1213
import android.support.v4.view.ViewPager;
@@ -98,9 +99,11 @@ private void createNavigationDrawer(AccountHeader account_header)
9899
{
99100
//if you want to update the items at a later time it is recommended to keep it in a variable
100101
PrimaryDrawerItem item1 = new PrimaryDrawerItem().withIdentifier(1).withName(R.string.drawer_item_home).withIcon(ic_home);
101-
SecondaryDrawerItem settings = new SecondaryDrawerItem().withIdentifier(2).withName(R.string.drawer_item_settings).withIcon(ic_settings);
102-
SecondaryDrawerItem feedback = new SecondaryDrawerItem().withIdentifier(3).withName(R.string.drawer_item_feedback).withIcon(ic_feedback);
103-
SecondaryDrawerItem about = new SecondaryDrawerItem().withIdentifier(4).withName(R.string.drawer_item_about).withIcon(ic_info);
102+
PrimaryDrawerItem item3 = new PrimaryDrawerItem().withIdentifier(3).withName(R.string.drawer_item_video).withIcon(ic_home);
103+
104+
SecondaryDrawerItem settings = new SecondaryDrawerItem().withIdentifier(4).withName(R.string.drawer_item_settings).withIcon(ic_settings);
105+
SecondaryDrawerItem feedback = new SecondaryDrawerItem().withIdentifier(5).withName(R.string.drawer_item_feedback).withIcon(ic_feedback);
106+
SecondaryDrawerItem about = new SecondaryDrawerItem().withIdentifier(6).withName(R.string.drawer_item_about).withIcon(ic_info);
104107

105108
//create the drawer and remember the `Drawer` navigationDrawer object
106109
final Drawer navigationDrawer = new DrawerBuilder()
@@ -110,6 +113,7 @@ private void createNavigationDrawer(AccountHeader account_header)
110113
.withActionBarDrawerToggle(true)
111114
.addDrawerItems(
112115
item1,
116+
item3,
113117
new DividerDrawerItem(),
114118
settings,
115119
feedback,
@@ -134,12 +138,17 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem)
134138
fragmentTransaction.commit();
135139
break;
136140

137-
case 2:
141+
case 3:
142+
intent = new Intent(MainActivity.this, VideoActivity.class);
143+
startActivity(intent);
144+
break;
145+
146+
case 4:
138147
intent = new Intent(MainActivity.this, SettingsActivity.class);
139148
startActivity(intent);
140149
break;
141150

142-
case 3:
151+
case 5:
143152
//Start a new activity for sending a feedback email
144153
intent = new Intent(android.content.Intent.ACTION_SEND);
145154
intent.setType("text/html");
@@ -149,7 +158,7 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem)
149158
startActivity(Intent.createChooser(intent, getString(R.string.title_send_feedback)));
150159
break;
151160

152-
case 4:
161+
case 6:
153162
intent = new Intent(MainActivity.this, AboutActivity.class);
154163
startActivity(intent);
155164
break;

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
<!-- Navigation drawer -->
2525
<string name="drawer_item_home">Home</string>
26+
<string name="drawer_item_video">Video Activity</string>
2627
<string name="drawer_item_settings">Settings</string>
2728
<string name="drawer_item_feedback">Feedback</string>
2829
<string name="drawer_item_about">About</string>

0 commit comments

Comments
 (0)