Commit d343169f authored by Luboš Horáček's avatar Luboš Horáček Committed by Matyáš Latner

Změna závislostí na maven repozitáře a ostranění TestFlight

parent c856d2ef
......@@ -6,3 +6,5 @@ gen
bin
*.log
local.properties
/.classpath
/.project
......@@ -154,26 +154,26 @@ configurations {
repositories {
mavenCentral()
maven{url 'http://www.bugsense.com/gradle/'} // bugsense gradle repository
maven{url 'https://repository-achartengine.forge.cloudbees.com/snapshot/'} // achartengine repository
}
dependencies {
unitTestCompile files('unitTestLibs/hamcrest-core-1.3.jar')
unitTestCompile files('unitTestLibs/junit-4.11.jar')
unitTestCompile files('unitTestLibs/android-19.jar')
unitTestCompile files('build/classes/debug')
unitTestCompile files('libraries/AndEngine-1.0.0-SNAPSHOT/build/classes/release/')
unitTestCompile files('libs/guava-16.0.jar')
compile files('libs/guava-16.0.jar')
compile files('libs/commons-lang3-3.1.jar')
compile files('libs/testflight-sdk-1.3.jar')
compile files('libs/bugsense-3.6.jar')
compile files('libs/gson-2.2.4.jar')
compile files('libs/achartengine-1.2.0.jar')
compile files('libs/activeandroid-3.1-SNAPSHOT.jar')
compile files('libs/guice-2.0-no_aop.jar')
compile files('libs/roboguice-2.0.jar')
compile files('libs/support-v4-r13.jar')
compile project(':libraries:AndEngine-1.0.0-SNAPSHOT')
unitTestCompile 'junit:junit:4.11'
compile 'org.achartengine:achartengine:1.2.0'
compile 'com.bugsense.trace:bugsense:3.6'
compile 'com.google.code.gson:gson:2.2.4'
compile 'org.roboguice:roboguice:2.0'
compile 'org.apache.commons:commons-lang3:3.2.1'
compile 'com.google.guava:guava:15.0'
}
task wrapper(type: Wrapper) {
......
......@@ -38,7 +38,6 @@ import android.widget.RelativeLayout;
import com.activeandroid.ActiveAndroid;
import com.activeandroid.util.Log;
import com.testflightapp.lib.TestFlight;
import cz.nic.tablexia.audio.SoundControl;
import cz.nic.tablexia.export.ExportControl;
......@@ -86,7 +85,7 @@ public class Tablexia extends com.activeandroid.app.Application {
private TablexiaState tablexiaState;
private List<TablexiaGlobalEventListener> tablexiaGlobalEventListeners;
private TablexiaGlobalEventListener userSelectListener;
private SoundControl globalSoundControl;
private SoundControl globalSoundControl;
private MainMenu mainMenu;
private UserMenu userMenu;
......@@ -100,7 +99,7 @@ public class Tablexia extends com.activeandroid.app.Application {
public void onCreate() {
super.onCreate();
TestFlight.takeOff(this, TESTFLIGHT_APP_TOKEN_ALPHA);
// TODO remove TestFlight.takeOff(this, TESTFLIGHT_APP_TOKEN_ALPHA);
Log.setEnabled(IS_LOGGING_ENABLED);
ActiveAndroid.setLoggingEnabled(IS_LOGGING_ENABLED);
......@@ -182,7 +181,7 @@ public class Tablexia extends com.activeandroid.app.Application {
tablexiaState.setAndSaveActiveUser(User.getUsersForId(user.getId()));
prepareMainMenu().resetMenu();
hideUserMenuHelp();
TestFlight.log("Select user: " + user.getNickName());
// TODO remove TestFlight.log("Select user: " + user.getNickName());
for (TablexiaGlobalEventListener tablexiaGlobalEventListener : tablexiaGlobalEventListeners) {
tablexiaGlobalEventListener.onUserSelected(user);
......@@ -600,7 +599,7 @@ public class Tablexia extends com.activeandroid.app.Application {
@Override
public void onAnimationEnd(Animator animation) {
((Activity) getCurrentMenuActivity()).startActivityForResult(intent, 0);
TestFlight.log("Create user button");
// TODO remove TestFlight.log("Create user button");
}
});
}
......
......@@ -22,7 +22,6 @@ package cz.nic.tablexia.game.games.bankovniloupez;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.andengine.engine.Engine;
import org.andengine.engine.FixedStepEngine;
......
......@@ -30,18 +30,18 @@ import com.activeandroid.util.Log;
import cz.nic.tablexia.R;
import cz.nic.tablexia.game.difficulty.GameDifficulty;
import cz.nic.tablexia.game.games.bankovniloupez.rules.easy.BB_0_BBRule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.easy.AC_0_ACRule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.easy.BB_0_BBRule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.easy.CARule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.easy.CA_0_CC_0_TRule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.hard.AA_0_NotAA_Rule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.hard.AAAA_Rule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.hard.AA_0_AA_0_TRule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.hard.AA_0_NotAA_Rule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.hard.AA_1_AARule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.hard.AAAA_Rule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.normal.AA_0_AARule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.normal.AA_0_CARule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.normal.BA_1_BARule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.normal.CA_0_AARule;
import cz.nic.tablexia.game.games.bankovniloupez.rules.normal.AA_0_AARule;
/**
......
......@@ -28,8 +28,6 @@ import org.andengine.audio.sound.SoundManager;
import android.content.Context;
import com.testflightapp.lib.TestFlight;
public class SfxManager {
private static final String SOUNDS_DIR = PronasledovaniActivity.BASE_DIR + "sfx/";
......@@ -55,7 +53,7 @@ public class SfxManager {
Sound soundInstance = SoundFactory.createSoundFromAsset(soundManager, context, sound.getResourceName() + SOUNDS_EXTENSION);
sounds.put(sound, soundInstance);
} catch (final IOException e) {
TestFlight.log("Error loading sound " + e.getMessage());
// TODO remove TestFlight.log("Error loading sound " + e.getMessage());
}
}
......
......@@ -73,10 +73,10 @@ import cz.nic.tablexia.game.games.unos.generator.PathGenerator;
import cz.nic.tablexia.game.games.unos.generator.TextureType;
import cz.nic.tablexia.game.games.unos.generator.TileMapGenerator;
import cz.nic.tablexia.game.games.unos.media.DirectionSounds;
import cz.nic.tablexia.game.games.unos.media.DirectionSounds.SoundPack;
import cz.nic.tablexia.game.games.unos.media.GfxManager;
import cz.nic.tablexia.game.games.unos.media.MfxManager;
import cz.nic.tablexia.game.games.unos.media.SoundType;
import cz.nic.tablexia.game.games.unos.media.DirectionSounds.SoundPack;
import cz.nic.tablexia.game.games.unos.model.PathPosition;
import cz.nic.tablexia.game.games.unos.model.Position;
import cz.nic.tablexia.game.games.unos.model.Tile;
......
......@@ -34,9 +34,6 @@ import android.content.Context;
import android.content.res.AssetManager;
import android.util.Log;
import android.util.Pair;
import com.testflightapp.lib.TestFlight;
import cz.nic.tablexia.game.games.unos.UnosActivity;
import cz.nic.tablexia.game.games.unos.generator.TextureType;
import cz.nic.tablexia.game.games.unos.model.Tile;
......@@ -75,7 +72,7 @@ public class GfxManager extends HashMap<TextureType, Pair<Texture, TextureRegion
put(textureType, new Pair<Texture, TextureRegion>(texture, textureRegion));
} catch (IOException e) {
Log.e(TAG, "Error loading texture " + path);
TestFlight.log("Error loading texture " + path);
// TODO remove TestFlight.log("Error loading texture " + path);
}
}
tileManager.loadTileTextures(tiles);
......
/*******************************************************************************
* Tablexia
* Tablexia
*
* Copyright (C) 2013 CZ NIC z.s.p.o. <podpora at nic dot cz>
*
......@@ -35,7 +35,6 @@ import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
import com.activeandroid.util.Log;
import com.testflightapp.lib.TestFlight;
import cz.nic.tablexia.game.games.unos.UnosActivity;
import cz.nic.tablexia.game.games.unos.media.SoundType.SoundClass;
......@@ -84,7 +83,7 @@ public class MfxManager {
sounds.put(sound, soundInstance);
} catch (final IOException e) {
Log.e(TAG, "Error loading sound " + e.getMessage() + " - resource " + sound.getResource());
TestFlight.log("Error loading sound " + e.getMessage() + " - resource " + sound.getResource());
// TODO remove TestFlight.log("Error loading sound " + e.getMessage() + " - resource " + sound.getResource());
}
} else {
try {
......@@ -93,7 +92,7 @@ public class MfxManager {
musics.put(sound, music);
} catch (final IOException e) {
Log.e(TAG, "Error loading sound " + e.getMessage() + " - resource: " + sound.getResource());
TestFlight.log("Error loading sound " + e.getMessage() + " - resource " + sound.getResource());
// TODO remove TestFlight.log("Error loading sound " + e.getMessage() + " - resource " + sound.getResource());
}
}
}
......@@ -155,7 +154,7 @@ public class MfxManager {
music.play();
} catch (final IOException e) {
TestFlight.log("Error loading sound " + e.getMessage() + " - resource " + sound);
// TODO remove TestFlight.log("Error loading sound " + e.getMessage() + " - resource " + sound);
if (!isRetry) {
playSound(sound, onCompletionListener, true);
}
......
......@@ -36,9 +36,6 @@ import android.content.Context;
import android.content.res.AssetManager;
import android.util.Log;
import android.util.Pair;
import com.testflightapp.lib.TestFlight;
import cz.nic.tablexia.game.games.unos.UnosActivity;
import cz.nic.tablexia.game.games.unos.model.Tile;
......@@ -75,7 +72,7 @@ public class TileManager extends HashMap<Tile, Pair<Texture, TextureRegion>> {
put(tile, new Pair<Texture, TextureRegion>(tileTexture, tileTextureRegion));
} catch (IOException e) {
Log.e(TAG, "Error loading texture " + path);
TestFlight.log("Error loading texture " + path);
// TODO remove TestFlight.log("Error loading texture " + path);
}
}
}
......
......@@ -43,8 +43,8 @@ import cz.nic.tablexia.menu.AbstractMenu.MenuChangeListener;
import cz.nic.tablexia.menu.MenuActivity;
import cz.nic.tablexia.menu.MenuEnum;
import cz.nic.tablexia.menu.mainmenu.screen.AbstractMenuFragment;
import cz.nic.tablexia.menu.mainmenu.screen.LoaderFragment;
import cz.nic.tablexia.menu.mainmenu.screen.AbstractMenuFragment.MenuFragmentVisibilityListener;
import cz.nic.tablexia.menu.mainmenu.screen.LoaderFragment;
import cz.nic.tablexia.menu.usermenu.User;
import cz.nic.tablexia.newusers.fragment.AnimationNewUserFragment;
import cz.nic.tablexia.util.BugSenseHelper;
......
......@@ -18,8 +18,6 @@
******************************************************************************/
package cz.nic.tablexia.menu.mainmenu.screen;
import com.activeandroid.util.Log;
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.Point;
import android.os.Bundle;
......@@ -33,6 +31,9 @@ import android.view.animation.LinearInterpolator;
import android.view.animation.RotateAnimation;
import android.widget.ImageView;
import android.widget.TextView;
import com.activeandroid.util.Log;
import cz.nic.tablexia.R;
import cz.nic.tablexia.Tablexia;
import cz.nic.tablexia.menu.MenuActivity;
......
/*******************************************************************************
* Tablexia
* Tablexia
*
* Copyright (C) 2013 CZ NIC z.s.p.o. <podpora at nic dot cz>
*
......@@ -30,9 +30,6 @@ import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener;
import android.widget.ListView;
import com.testflightapp.lib.TestFlight;
import cz.nic.tablexia.R;
import cz.nic.tablexia.Tablexia;
import cz.nic.tablexia.audio.SoundControl;
......@@ -67,26 +64,26 @@ public class UserMenu extends AbstractMenu implements OnItemClickListener, OnIte
@Override
public void initMenu() {
hideMenuToggelButton();
ListView userMenuListView = (ListView) tablexiaContext.getCurrentMenuActivity().findViewById(R.id.usermenu_listview);
userMenuListView.setAdapter(userMenuAdapter.refresh());
userMenuListView.setOnItemClickListener(this);
userMenuListView.setOnItemLongClickListener(this);
}
private void hideMenuToggelButton() {
final View menuRightBorder = tablexiaContext.getCurrentMenuActivity().findViewById(R.id.mainmenu_rightborder);
final ViewPropertyAnimator animator = menuRightBorder.animate();
animator.setInterpolator(new AccelerateInterpolator()).translationX(-menuRightBorder.getWidth()).setListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
animator.setListener(null);
menuRightBorder.setVisibility(View.GONE);
}
});
}
......@@ -101,7 +98,7 @@ public class UserMenu extends AbstractMenu implements OnItemClickListener, OnIte
menuClickableLock = false;
soundControl.playSound(PermanentSounds.BUTTON_SOUND, false);
tablexiaContext.getCurrentMenuActivity().addMenuDrawerListener(new DrawerListenerAdapter() {
@Override
public void onDrawerClosed(View drawerView) {
menuClickableLock = true;
......@@ -109,7 +106,7 @@ public class UserMenu extends AbstractMenu implements OnItemClickListener, OnIte
});
tablexiaContext.getCurrentMenuActivity().lockCloseMenuDrawer();
arg1.postDelayed(new Runnable() {
@Override
public void run() {
if (position == userMenuAdapter.getUserCount()) {
......@@ -117,7 +114,7 @@ public class UserMenu extends AbstractMenu implements OnItemClickListener, OnIte
} else {
tablexiaContext.doSelectUser(userMenuAdapter.getUserAtPosition(position));
tablexiaContext.changeMenu(AbstractMenu.MAIN_MENU);
TestFlight.log("Login user: " + userMenuAdapter.getUserAtPosition(position).getNickName());
// TODO remove TestFlight.log("Login user: " + userMenuAdapter.getUserAtPosition(position).getNickName());
}
}
}, 1000);
......
......@@ -68,9 +68,6 @@ import android.widget.Switch;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
import com.testflightapp.lib.TestFlight;
import cz.nic.tablexia.R;
import cz.nic.tablexia.Tablexia;
import cz.nic.tablexia.audio.SoundControl;
......@@ -412,7 +409,7 @@ public class NewUserFormFragment extends RoboFragment implements OnClickListener
Intent data = new Intent();
data.putExtra("userId", newUser.getId());
getActivity().setResult(Activity.RESULT_OK, data);
TestFlight.log("Created user: " + newUser.getNickName());
// TODO remove TestFlight.log("Created user: " + newUser.getNickName());
((NewUserActivity) getActivity()).hideScreen(new AnimatorListenerAdapter() {
......@@ -721,7 +718,7 @@ public class NewUserFormFragment extends RoboFragment implements OnClickListener
Intent data = new Intent();
data.putExtra("userId", newUser.getId());
getActivity().setResult(Activity.RESULT_OK, data);
TestFlight.log("Created user: " + newUser.getNickName());
// TODO remove TestFlight.log("Created user: " + newUser.getNickName());
((NewUserActivity) getActivity()).hideScreen(new AnimatorListenerAdapter() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment