Skip to content
This repository has been archived by the owner on Sep 25, 2023. It is now read-only.

Commit

Permalink
fixed ics problems
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Messerschmidt committed Mar 11, 2012
1 parent f1adc78 commit 886d42f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
4 changes: 3 additions & 1 deletion pom.xml
Expand Up @@ -10,7 +10,7 @@
<name>geekli.st</name>

<properties>
<abs.version>4.0.0-RC1</abs.version>
<abs.version>4.0.0</abs.version>
<project.property.version>${project.version}</project.property.version>
<project.property.application.debuggable>true</project.property.application.debuggable>
</properties>
Expand All @@ -33,11 +33,13 @@
<version>0.8.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<!--
<dependency>
<groupId>com.actionbarsherlock</groupId>
<artifactId>plugin-support-lib</artifactId>
<version>${abs.version}</version>
</dependency>
-->
<dependency>
<groupId>com.actionbarsherlock</groupId>
<artifactId>library</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion project.properties
Expand Up @@ -8,5 +8,5 @@
# project structure.

# Project target.
target=android-15
target=android-14
android.library.reference.1=../library
11 changes: 7 additions & 4 deletions src/st/geekli/android/MainActivity.java
Expand Up @@ -17,10 +17,10 @@
public class MainActivity extends SherlockFragmentActivity {
private ActionBar actionBar;

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

if (!Configuration.isAuth(this)) {
startActivity(new Intent(this, AuthActivity.class));
}
Expand All @@ -47,6 +47,7 @@ public void onResume() {
}
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
getSupportMenuInflater().inflate(R.menu.options_menu, menu);
return true;
Expand All @@ -67,12 +68,14 @@ public GeekTabListener(Fragment fragment) {

@Override
public void onTabUnselected(Tab arg0, FragmentTransaction ft) {
ft.remove(mFragment);
getSupportFragmentManager().beginTransaction().remove(mFragment).commit();
}

@Override
public void onTabSelected(Tab tab, FragmentTransaction ft) {
ft.add(R.id.tabcontent, mFragment, "");
if (mFragment != null) {
getSupportFragmentManager().beginTransaction().add(R.id.tabcontent, mFragment, "").commit();
}
}

@Override
Expand Down

0 comments on commit 886d42f

Please sign in to comment.