Permalink
Browse files

Merge pull request #11 from ScootrNova/v1.7.0-update

V1.7.0 update
  • Loading branch information...
2 parents 1300c7c + 6dde6e0 commit f347428d904fa804b21b44716d7e1338e398ca59 Charles Madere committed Dec 21, 2013
Showing 862 changed files with 1,138,985 additions and 1,587,050 deletions.
View
Binary file not shown.
@@ -1 +1 @@
-android
+Classy Games
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="CMadere">
+ <words>
+ <w>attrs</w>
+ </words>
+ </dictionary>
+</component>
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="gcm">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/classygames/libs/gcm.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
@@ -1,5 +1,5 @@
<component name="libraryTable">
- <library name="GoogleAdMobAdsSdk-6.4.1">
+ <library name="google-admob-ads-sdk">
<CLASSES>
<root url="jar://$PROJECT_DIR$/classygames/libs/GoogleAdMobAdsSdk-6.4.1.jar!/" />
</CLASSES>
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="google-play-services">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/googleplayservices/libs/google-play-services.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="universal-image-loader">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/classygames/libs/universal-image-loader-1.9.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$PROJECT_DIR$/classygames/libs/universal-image-loader-1.9.0.jar!/" />
+ </SOURCES>
+ </library>
+</component>
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="universal-image-loader-1.8.4">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/classygames/libs/universal-image-loader-1.8.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
@@ -4,7 +4,7 @@
<entry_points version="2.0" />
</component>
<component name="IdProvider" IDEtalkID="A1FE8E670A6CEFC4896F11D7399E3DC3" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.2.2 Google APIs" project-jdk-type="Android SDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.4.2 Google APIs" project-jdk-type="Android SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
@@ -2,10 +2,10 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/facebook/FacebookSDK.iml" filepath="$PROJECT_DIR$/facebook/FacebookSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/actionbarsherlock/actionbarsherlock.iml" filepath="$PROJECT_DIR$/actionbarsherlock/actionbarsherlock.iml" />
<module fileurl="file://$PROJECT_DIR$/classygames/classygames.iml" filepath="$PROJECT_DIR$/classygames/classygames.iml" />
- <module fileurl="file://$PROJECT_DIR$/classygamestest/classygamestest.iml" filepath="$PROJECT_DIR$/classygamestest/classygamestest.iml" />
+ <module fileurl="file://$PROJECT_DIR$/facebook/facebook.iml" filepath="$PROJECT_DIR$/facebook/facebook.iml" />
+ <module fileurl="file://$PROJECT_DIR$/googleplayservices/googleplayservices.iml" filepath="$PROJECT_DIR$/googleplayservices/googleplayservices.iml" />
</modules>
</component>
</project>
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>actionbarsherlock</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock">
-
- <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock">
+ <uses-sdk android:minSdkVersion="8" />
+ <application/>
</manifest>
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="EclipseModuleManager" forced_jdk="true">
- <src_description expected_position="1">
- <src_folder value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" expected_position="0" />
- <src_folder value="com.android.ide.eclipse.adt.LIBRARIES" expected_position="1" />
- <src_folder value="file://$MODULE_DIR$/src" expected_position="2" />
- <src_folder value="file://$MODULE_DIR$/gen" expected_position="3" />
- </src_description>
- </component>
<component name="FacetManager">
<facet type="android" name="Android">
<configuration>
@@ -20,9 +12,9 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
</content>
- <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="android-support-v4" level="project" />
</component>
Binary file not shown.
@@ -3,10 +3,13 @@
#
# This file must be checked in Version Control Systems.
#
-# To customize properties used by the Ant build system use,
+# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
android.library=true
# Project target.
-target=android-17
+target=Google Inc.:Google APIs:19
@@ -40,7 +40,7 @@
<ImageView
android:id="@+id/abs__search_button"
- style="?android:attr/actionButtonStyle"
+ style="?attr/actionButtonStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
@@ -3,10 +3,10 @@
import android.util.Log;
import android.view.View;
import android.view.Window;
+import com.actionbarsherlock.ActionBarSherlock;
import com.actionbarsherlock.ActionBarSherlock.OnCreatePanelMenuListener;
import com.actionbarsherlock.ActionBarSherlock.OnMenuItemSelectedListener;
import com.actionbarsherlock.ActionBarSherlock.OnPreparePanelListener;
-import com.actionbarsherlock.BuildConfig;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
@@ -38,11 +38,11 @@
@Override
public boolean onCreatePanelMenu(int featureId, Menu menu) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
if (featureId == Window.FEATURE_OPTIONS_PANEL) {
boolean result = onCreateOptionsMenu(menu);
- if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result);
MenuInflater inflater = getSupportMenuInflater();
boolean show = false;
@@ -72,22 +72,22 @@ public boolean onCreatePanelMenu(int featureId, Menu menu) {
mCreatedMenus = newMenus;
- if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + show);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + show);
result |= show;
- if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
return result;
}
return false;
}
@Override
public boolean onPreparePanel(int featureId, View view, Menu menu) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu);
if (featureId == Window.FEATURE_OPTIONS_PANEL) {
boolean result = onPrepareOptionsMenu(menu);
- if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result);
boolean show = false;
if (mFragments.mAdded != null) {
@@ -100,19 +100,19 @@ public boolean onPreparePanel(int featureId, View view, Menu menu) {
}
}
- if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + show);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + show);
result |= show;
result &= menu.hasVisibleItems();
- if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
return result;
}
return false;
}
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
+ if (ActionBarSherlock.DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
if (featureId == Window.FEATURE_OPTIONS_PANEL) {
if (onOptionsItemSelected(item)) {
@@ -41,6 +41,7 @@
*/
public abstract class ActionBarSherlock {
protected static final String TAG = "ActionBarSherlock";
+ public static final boolean DEBUG = false;
private static final Class<?>[] CONSTRUCTOR_ARGS = new Class[] { Activity.class, int.class };
private static final HashMap<Implementation, Class<? extends ActionBarSherlock>> IMPLEMENTATIONS =
@@ -122,12 +123,12 @@ public static void registerImplementation(Class<? extends ActionBarSherlock> imp
if (!implementationClass.isAnnotationPresent(Implementation.class)) {
throw new IllegalArgumentException("Class " + implementationClass.getSimpleName() + " is not annotated with @Implementation");
} else if (IMPLEMENTATIONS.containsValue(implementationClass)) {
- if (BuildConfig.DEBUG) Log.w(TAG, "Class " + implementationClass.getSimpleName() + " already registered");
+ if (DEBUG) Log.w(TAG, "Class " + implementationClass.getSimpleName() + " already registered");
return;
}
Implementation impl = implementationClass.getAnnotation(Implementation.class);
- if (BuildConfig.DEBUG) Log.i(TAG, "Registering " + implementationClass.getSimpleName() + " with qualifier " + impl);
+ if (DEBUG) Log.i(TAG, "Registering " + implementationClass.getSimpleName() + " with qualifier " + impl);
IMPLEMENTATIONS.put(impl, implementationClass);
}
@@ -223,7 +224,7 @@ public static ActionBarSherlock wrap(Activity activity, int flags) {
throw new IllegalStateException("No implementations match configuration.");
}
Class<? extends ActionBarSherlock> impl = impls.values().iterator().next();
- if (BuildConfig.DEBUG) Log.i(TAG, "Using implementation: " + impl.getSimpleName());
+ if (DEBUG) Log.i(TAG, "Using implementation: " + impl.getSimpleName());
try {
Constructor<? extends ActionBarSherlock> ctor = impl.getConstructor(CONSTRUCTOR_ARGS);
@@ -253,7 +254,7 @@ public static ActionBarSherlock wrap(Activity activity, int flags) {
protected ActionBarSherlock(Activity activity, int flags) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[<ctor>] activity: " + activity + ", flags: " + flags);
+ if (DEBUG) Log.d(TAG, "[<ctor>] activity: " + activity + ", flags: " + flags);
mActivity = activity;
mIsDelegate = (flags & FLAG_DELEGATE) != 0;
@@ -551,7 +552,7 @@ public void dispatchRestoreInstanceState(Bundle savedInstanceState) {}
* @return {@code true} if menu creation should proceed.
*/
protected final boolean callbackCreateOptionsMenu(Menu menu) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] menu: " + menu);
+ if (DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] menu: " + menu);
boolean result = true;
if (mActivity instanceof OnCreatePanelMenuListener) {
@@ -562,7 +563,7 @@ protected final boolean callbackCreateOptionsMenu(Menu menu) {
result = listener.onCreateOptionsMenu(menu);
}
- if (BuildConfig.DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] returning " + result);
+ if (DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] returning " + result);
return result;
}
@@ -572,7 +573,7 @@ protected final boolean callbackCreateOptionsMenu(Menu menu) {
* @return {@code true} if menu preparation should proceed.
*/
protected final boolean callbackPrepareOptionsMenu(Menu menu) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] menu: " + menu);
+ if (DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] menu: " + menu);
boolean result = true;
if (mActivity instanceof OnPreparePanelListener) {
@@ -583,7 +584,7 @@ protected final boolean callbackPrepareOptionsMenu(Menu menu) {
result = listener.onPrepareOptionsMenu(menu);
}
- if (BuildConfig.DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] returning " + result);
+ if (DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] returning " + result);
return result;
}
@@ -595,7 +596,7 @@ protected final boolean callbackPrepareOptionsMenu(Menu menu) {
* @return {@code true} if the item selection was handled in the callback.
*/
protected final boolean callbackOptionsItemSelected(MenuItem item) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] item: " + item.getTitleCondensed());
+ if (DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] item: " + item.getTitleCondensed());
boolean result = false;
if (mActivity instanceof OnMenuItemSelectedListener) {
@@ -606,7 +607,7 @@ protected final boolean callbackOptionsItemSelected(MenuItem item) {
result = listener.onOptionsItemSelected(item);
}
- if (BuildConfig.DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] returning " + result);
+ if (DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] returning " + result);
return result;
}
@@ -666,7 +667,7 @@ protected final boolean callbackOptionsItemSelected(MenuItem item) {
* @param view The desired content to display.
*/
public void setContentView(View view) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[setContentView] view: " + view);
+ if (DEBUG) Log.d(TAG, "[setContentView] view: " + view);
setContentView(view, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
}
@@ -698,7 +699,7 @@ public void setContentView(View view) {
* Change the title associated with this activity.
*/
public void setTitle(int resId) {
- if (BuildConfig.DEBUG) Log.d(TAG, "[setTitle] resId: " + resId);
+ if (DEBUG) Log.d(TAG, "[setTitle] resId: " + resId);
setTitle(mActivity.getString(resId));
}
@@ -767,7 +768,7 @@ public void setTitle(int resId) {
* @return Menu inflater instance.
*/
public MenuInflater getMenuInflater() {
- if (BuildConfig.DEBUG) Log.d(TAG, "[getMenuInflater]");
+ if (DEBUG) Log.d(TAG, "[getMenuInflater]");
// Make sure that action views can get an appropriate theme.
if (mMenuInflater == null) {
Oops, something went wrong.

0 comments on commit f347428

Please sign in to comment.