Skip to content

Commit

Permalink
Merge pull request #33 from pdpiech/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
pdpiech committed Sep 14, 2014
2 parents e0d23f8 + 76fc353 commit 5e41011
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions RPIMobile/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry combineaccessrules="false" kind="src" path="/actionbarsherlock"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/android-rss-master"/>
<classpathentry combineaccessrules="false" kind="src" path="/google-play-services_lib"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry combineaccessrules="false" kind="src" path="/actionbarsherlock"/>
<classpathentry combineaccessrules="false" kind="src" path="/google-play-services_lib"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
4 changes: 2 additions & 2 deletions RPIMobile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.rpi.rpimobile"
android:versionCode="9"
android:versionName="1.0.2" >
android:versionCode="11"
android:versionName="1.0.3" >

<!-- Target Version 2.3.3 and up -->
<uses-sdk
Expand Down
6 changes: 3 additions & 3 deletions RPIMobile/project.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
target=android-19
android.library.reference.1=..\\android-rss-master
android.library.reference.2=..\\actionbarsherlock
android.library.reference.3=../google-play-services_lib
android.library.reference.1=..\\actionbarsherlock
android.library.reference.2=..\\android-rss-master
android.library.reference.3=..\\google-play-services_lib
5 changes: 4 additions & 1 deletion RPIMobile/src/edu/rpi/rpimobile/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.preference.PreferenceManager;
import android.support.v4.app.ActionBarDrawerToggle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
Expand Down Expand Up @@ -202,7 +203,9 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
//Function that takes the selected item and launches the respective activity
private void selectItem(int position) {
logcat( "Beginnning fragment Transaction");
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
FragmentManager fm = getSupportFragmentManager();
fm.popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
FragmentTransaction ft = fm.beginTransaction();
// Locate Position
switch (position) {
case 0: //weather
Expand Down

0 comments on commit 5e41011

Please sign in to comment.