fix no github icon on viewpager activity

Rain168 · Jan 5, 2014 · b2aa318 · b2aa318
1 parent 47b479b
commit b2aa318
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 435,197 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ target/*
 .svn
 gen
 bin/*
+proguard/*
 
 *.pydevproject
 .project
@@ -19,6 +20,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
+*analytics.xml
 
 # External tool builders
 .externalToolBuilders/

diff --git a/proguard/dump.txt b/proguard/dump.txt
diff --git a/proguard/mapping.txt b/proguard/mapping.txt
diff --git a/proguard/seeds.txt b/proguard/seeds.txt
diff --git a/proguard/usage.txt b/proguard/usage.txt
diff --git a/src/cn/trinea/android/demo/ViewPagerDemo.java b/src/cn/trinea/android/demo/ViewPagerDemo.java
@@ -3,12 +3,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.view.Menu;
 import android.view.MenuItem;
 import cn.trinea.android.demo.utils.AppUtils;
 
@@ -21,18 +23,22 @@
  */
 public class ViewPagerDemo extends FragmentActivity {
 
-    List<Fragment> fragmentList = new ArrayList<Fragment>();
-    List<String>   titleList    = new ArrayList<String>();
+    private static int TOTAL_COUNT = 3;
+
+    private Context    context;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.view_pager_demo);
 
+        context = getApplicationContext();
         AppUtils.init(this);
 
         ViewPager vp = (ViewPager)findViewById(R.id.view_pager);
-        for (int i = 0; i < 3; i++) {
+        List<Fragment> fragmentList = new ArrayList<Fragment>();
+        List<String> titleList = new ArrayList<String>();
+        for (int i = 0; i < TOTAL_COUNT; i++) {
             ViewPagerFragment viewPagerFragment1 = new ViewPagerFragment();
             Bundle bundle = new Bundle();
             bundle.putInt("upImageId", 0);
@@ -85,6 +91,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 onBackPressed();
                 return true;
             }
+            case R.id.github: {
+                AppUtils.urlOpen(context, getString(R.string.github_trinea));
+                return true;
+            }
         }
         return false;
     }
@@ -100,4 +110,10 @@ protected void onStop() {
         super.onStop();
         EasyTracker.getInstance(this).activityStop(this);
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
 }
diff --git a/src/cn/trinea/android/demo/ViewPagerMulTiFragmentDemo.java b/src/cn/trinea/android/demo/ViewPagerMulTiFragmentDemo.java
@@ -4,6 +4,7 @@
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
@@ -12,6 +13,9 @@
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import cn.trinea.android.demo.utils.AppUtils;
+
+import com.google.analytics.tracking.android.EasyTracker;
 
 /**
  * ViewPager implements gallery effect
@@ -110,7 +114,29 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 onBackPressed();
                 return true;
             }
+            case R.id.github: {
+                AppUtils.urlOpen(context, getString(R.string.github_trinea));
+                return true;
+            }
         }
         return false;
     }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EasyTracker.getInstance(this).activityStart(this);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        EasyTracker.getInstance(this).activityStop(this);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
 }