Commit 07492c3a authored by Thomas Krex's avatar Thomas Krex

added feedback library -> enables feedback function for user,

developer can answer directly to the user by email
parent 0ae49c6c
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>TTTAndroidClient</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<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 kind="lib" path="libs/commons-io-2.4.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
......@@ -36,6 +36,15 @@
android:configChanges="orientation|screenSize"
android:label="Feeds"
android:launchMode="singleTask" >
<intent-filter>
<data android:scheme="http" />
<data android:host="ttt.in.tum.de" />
<data android:pathPattern=".*"/>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
</intent-filter>
</activity>
<activity
android:name="tttclient.activities.FeedDetailActivity"
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke
android:width="1dip"
android:color="@android:color/background_dark" >
</stroke>
</shape>
\ No newline at end of file
......@@ -14,8 +14,16 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="75dp"
android:background="@android:color/transparent"
android:text="@string/watch" >
</Button>
android:text="@string/watch" />
<Button
android:id="@+id/feedback_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/watch_button"
android:layout_alignRight="@+id/watch_button"
android:layout_below="@+id/watch_button"
android:layout_marginTop="124dp"
android:text="Feedback" />
</RelativeLayout>
\ No newline at end of file
......@@ -188,6 +188,16 @@ public class FeedActivity extends SherlockActivity implements
}
});
Intent intent = getIntent();
String action = intent.getAction();
if (Intent.ACTION_VIEW.equals(action)) {
Log.d("IntentFIlter", intent.getDataString());
urlTxt.setText(intent.getDataString());
addDialog.show();
}
}
@Override
......
......@@ -7,6 +7,7 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import com.actionbarsherlock.app.SherlockActivity;
import com.suredigit.inappfeedback.FeedbackDialog;
import de.tum.in.tttclient.R;
......@@ -18,10 +19,13 @@ import de.tum.in.tttclient.R;
*/
public class MainActivity extends SherlockActivity {
private FeedbackDialog feedBack;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
feedBack = new FeedbackDialog(this, "AF-C588E3CDEF37-CB");
Button watchButton = (Button) findViewById(R.id.watch_button);
watchButton.setOnClickListener(new OnClickListener() {
......@@ -34,5 +38,20 @@ public class MainActivity extends SherlockActivity {
}
});
Button feedbackButton = (Button) findViewById(R.id.feedback_button);
feedbackButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
feedBack.show();
}
});
}
@Override
protected void onPause() {
super.onPause();
feedBack.dismiss();
}
}
......@@ -136,6 +136,7 @@ public abstract class SherlockActivity extends Activity implements OnCreatePanel
return getSherlock().getMenuInflater();
}
@Override
public void invalidateOptionsMenu() {
getSherlock().dispatchInvalidateOptionsMenu();
}
......
......@@ -125,6 +125,7 @@ public abstract class SherlockExpandableListActivity extends ExpandableListActiv
return getSherlock().getMenuInflater();
}
@Override
public void invalidateOptionsMenu() {
getSherlock().dispatchInvalidateOptionsMenu();
}
......
......@@ -137,18 +137,21 @@ public class SherlockFragmentActivity extends Watson implements OnActionModeStar
// Native menu handling
///////////////////////////////////////////////////////////////////////////
@Override
public MenuInflater getSupportMenuInflater() {
if (ActionBarSherlock.DEBUG) Log.d(TAG, "[getSupportMenuInflater]");
return getSherlock().getMenuInflater();
}
@Override
public void invalidateOptionsMenu() {
if (ActionBarSherlock.DEBUG) Log.d(TAG, "[invalidateOptionsMenu]");
getSherlock().dispatchInvalidateOptionsMenu();
}
@Override
public void supportInvalidateOptionsMenu() {
if (ActionBarSherlock.DEBUG) Log.d(TAG, "[supportInvalidateOptionsMenu]");
......@@ -234,14 +237,17 @@ public class SherlockFragmentActivity extends Watson implements OnActionModeStar
// Sherlock menu handling
///////////////////////////////////////////////////////////////////////////
@Override
public boolean onCreateOptionsMenu(Menu menu) {
return true;
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
return false;
}
......
......@@ -136,6 +136,7 @@ public abstract class SherlockListActivity extends ListActivity implements OnCre
return getSherlock().getMenuInflater();
}
@Override
public void invalidateOptionsMenu() {
getSherlock().dispatchInvalidateOptionsMenu();
}
......
......@@ -136,6 +136,7 @@ public abstract class SherlockPreferenceActivity extends PreferenceActivity impl
return getSherlock().getMenuInflater();
}
@Override
public void invalidateOptionsMenu() {
getSherlock().dispatchInvalidateOptionsMenu();
}
......
package com.actionbarsherlock.internal;
import org.xmlpull.v1.XmlPullParser;
import android.app.Activity;
import android.content.Context;
import android.content.res.AssetManager;
......@@ -7,25 +9,27 @@ import android.content.res.XmlResourceParser;
import android.os.Build;
import android.util.DisplayMetrics;
import android.util.Log;
import com.actionbarsherlock.ActionBarSherlock;
import com.actionbarsherlock.R;
import org.xmlpull.v1.XmlPullParser;
public final class ResourcesCompat {
private static final String TAG = "ResourcesCompat";
//No instances
private ResourcesCompat() {}
// No instances
private ResourcesCompat() {
}
/**
* Support implementation of {@code getResources().getBoolean()} that we
* can use to simulate filtering based on width and smallest width
* qualifiers on pre-3.2.
* Support implementation of {@code getResources().getBoolean()} that we can
* use to simulate filtering based on width and smallest width qualifiers on
* pre-3.2.
*
* @param context Context to load booleans from on 4.0+ and to fetch the
* display metrics.
* @param id Id of boolean to load.
* @param context
* Context to load booleans from on 4.0+ and to fetch the display
* metrics.
* @param id
* Id of boolean to load.
* @return Associated boolean value as reflected by the current display
* metrics.
*/
......@@ -41,39 +45,41 @@ public final class ResourcesCompat {
if (id == R.bool.abs__action_bar_embed_tabs) {
if (widthDp >= 480) {
return true; //values-w480dp
return true; // values-w480dp
}
return false; //values
return false; // values
}
if (id == R.bool.abs__split_action_bar_is_narrow) {
if (widthDp >= 480) {
return false; //values-w480dp
return false; // values-w480dp
}
return true; //values
return true; // values
}
if (id == R.bool.abs__action_bar_expanded_action_views_exclusive) {
if (smallestWidthDp >= 600) {
return false; //values-sw600dp
return false; // values-sw600dp
}
return true; //values
return true; // values
}
if (id == R.bool.abs__config_allowActionMenuItemTextWithIcon) {
if (widthDp >= 480) {
return true; //values-w480dp
return true; // values-w480dp
}
return false; //values
return false; // values
}
throw new IllegalArgumentException("Unknown boolean resource ID " + id);
}
/**
* Support implementation of {@code getResources().getInteger()} that we
* can use to simulate filtering based on width qualifiers on pre-3.2.
* Support implementation of {@code getResources().getInteger()} that we can
* use to simulate filtering based on width qualifiers on pre-3.2.
*
* @param context Context to load integers from on 3.2+ and to fetch the
* display metrics.
* @param id Id of integer to load.
* @param context
* Context to load integers from on 3.2+ and to fetch the display
* metrics.
* @param id
* Id of integer to load.
* @return Associated integer value as reflected by the current display
* metrics.
*/
......@@ -87,15 +93,15 @@ public final class ResourcesCompat {
if (id == R.integer.abs__max_action_buttons) {
if (widthDp >= 600) {
return 5; //values-w600dp
return 5; // values-w600dp
}
if (widthDp >= 500) {
return 4; //values-w500dp
return 4; // values-w500dp
}
if (widthDp >= 360) {
return 3; //values-w360dp
return 3; // values-w360dp
}
return 2; //values
return 2; // values
}
throw new IllegalArgumentException("Unknown integer resource ID " + id);
......@@ -106,18 +112,22 @@ public final class ResourcesCompat {
* activity by using an XML pull parser. This should allow us to read the
* logo attribute regardless of the platform it is being run on.
*
* @param activity Activity instance.
* @param activity
* Activity instance.
* @return Logo resource ID.
*/
public static int loadLogoFromManifest(Activity activity) {
int logo = 0;
try {
final String thisPackage = activity.getClass().getName();
if (ActionBarSherlock.DEBUG) Log.i(TAG, "Parsing AndroidManifest.xml for " + thisPackage);
if (ActionBarSherlock.DEBUG)
Log.i(TAG, "Parsing AndroidManifest.xml for " + thisPackage);
final String packageName = activity.getApplicationInfo().packageName;
final AssetManager am = activity.createPackageContext(packageName, 0).getAssets();
final XmlResourceParser xml = am.openXmlResourceParser("AndroidManifest.xml");
final AssetManager am = activity.createPackageContext(packageName,
0).getAssets();
final XmlResourceParser xml = am
.openXmlResourceParser("AndroidManifest.xml");
int eventType = xml.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) {
......@@ -125,48 +135,63 @@ public final class ResourcesCompat {
String name = xml.getName();
if ("application".equals(name)) {
//Check if the <application> has the attribute
if (ActionBarSherlock.DEBUG) Log.d(TAG, "Got <application>");
// Check if the <application> has the attribute
if (ActionBarSherlock.DEBUG)
Log.d(TAG, "Got <application>");
for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
if (ActionBarSherlock.DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
if (ActionBarSherlock.DEBUG)
Log.d(TAG,
xml.getAttributeName(i) + ": "
+ xml.getAttributeValue(i));
if ("logo".equals(xml.getAttributeName(i))) {
logo = xml.getAttributeResourceValue(i, 0);
break; //out of for loop
break; // out of for loop
}
}
} else if ("activity".equals(name)) {
//Check if the <activity> is us and has the attribute
if (ActionBarSherlock.DEBUG) Log.d(TAG, "Got <activity>");
// Check if the <activity> is us and has the attribute
if (ActionBarSherlock.DEBUG)
Log.d(TAG, "Got <activity>");
Integer activityLogo = null;
String activityPackage = null;
boolean isOurActivity = false;
for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
if (ActionBarSherlock.DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
if (ActionBarSherlock.DEBUG)
Log.d(TAG,
xml.getAttributeName(i) + ": "
+ xml.getAttributeValue(i));
//We need both uiOptions and name attributes
// We need both uiOptions and name attributes
String attrName = xml.getAttributeName(i);
if ("logo".equals(attrName)) {
activityLogo = xml.getAttributeResourceValue(i, 0);
activityLogo = xml.getAttributeResourceValue(i,
0);
} else if ("name".equals(attrName)) {
activityPackage = ActionBarSherlockCompat.cleanActivityName(packageName, xml.getAttributeValue(i));
activityPackage = ActionBarSherlockCompat
.cleanActivityName(packageName,
xml.getAttributeValue(i));
if (!thisPackage.equals(activityPackage)) {
break; //on to the next
break; // on to the next
}
isOurActivity = true;
}
//Make sure we have both attributes before processing
if ((activityLogo != null) && (activityPackage != null)) {
//Our activity, logo specified, override with our value
// Make sure we have both attributes before
// processing
if ((activityLogo != null)
&& (activityPackage != null)) {
// Our activity, logo specified, override with
// our value
logo = activityLogo.intValue();
}
}
if (isOurActivity) {
//If we matched our activity but it had no logo don't
//do any more processing of the manifest
// If we matched our activity but it had no logo
// don't
// do any more processing of the manifest
break;
}
}
......@@ -176,7 +201,8 @@ public final class ResourcesCompat {
} catch (Exception e) {
e.printStackTrace();
}
if (ActionBarSherlock.DEBUG) Log.i(TAG, "Returning " + Integer.toHexString(logo));
if (ActionBarSherlock.DEBUG)
Log.i(TAG, "Returning " + Integer.toHexString(logo));
return logo;
}
}
......@@ -506,9 +506,11 @@ public final class AnimatorSet extends Animator {
mDelayAnim.setDuration(mStartDelay);
mDelayAnim.addListener(new AnimatorListenerAdapter() {
boolean canceled = false;
@Override
public void onAnimationCancel(Animator anim) {
canceled = true;
}
@Override
public void onAnimationEnd(Animator anim) {
if (!canceled) {
int numNodes = nodesToStart.size();
......@@ -642,12 +644,14 @@ public final class AnimatorSet extends Animator {
* to prevent follow-on animations from running when some dependency
* animation is canceled.
*/
@Override
public void onAnimationCancel(Animator animation) {
}
/**
* An end event is received - see if this is an event we are listening for
*/
@Override
public void onAnimationEnd(Animator animation) {
if (mRule == Dependency.AFTER) {
startIfReady(animation);
......@@ -657,12 +661,14 @@ public final class AnimatorSet extends Animator {
/**
* Ignore repeat events for now
*/
@Override
public void onAnimationRepeat(Animator animation) {
}
/**
* A start event is received - see if this is an event we are listening for
*/
@Override
public void onAnimationStart(Animator animation) {
if (mRule == Dependency.WITH) {
startIfReady(animation);
......@@ -711,6 +717,7 @@ public final class AnimatorSet extends Animator {
mAnimatorSet = animatorSet;
}
@Override
public void onAnimationCancel(Animator animation) {
if (!mTerminated) {
// Listeners are already notified of the AnimatorSet canceling in cancel().
......@@ -726,6 +733,7 @@ public final class AnimatorSet extends Animator {
}
}
@Override
public void onAnimationEnd(Animator animation) {
animation.removeListener(this);
mPlayingSet.remove(animation);
......@@ -760,10 +768,12 @@ public final class AnimatorSet extends Animator {
}
// Nothing to do
@Override
public void onAnimationRepeat(Animator animation) {
}
// Nothing to do
@Override
public void onAnimationStart(Animator animation) {
}
......
......@@ -35,6 +35,7 @@ public class FloatEvaluator implements TypeEvaluator<Number> {
* @return A linear interpolation between the start and end values, given the
* <code>fraction</code> parameter.
*/
@Override
public Float evaluate(float fraction, Number startValue, Number endValue) {
float startFloat = startValue.floatValue();
return startFloat + fraction * (endValue.floatValue() - startFloat);
......
......@@ -35,6 +35,7 @@ public class IntEvaluator implements TypeEvaluator<Integer> {
* @return A linear interpolation between the start and end values, given the
* <code>fraction</code> parameter.
*/
@Override
public Integer evaluate(float fraction, Integer startValue, Integer endValue) {
int startInt = startValue;
return (int)(startInt + fraction * (endValue - startInt));
......
......@@ -253,10 +253,12 @@ public abstract class Keyframe implements Cloneable {
mValueType = mHasValue ? value.getClass() : Object.class;
}
@Override
public Object getValue() {
return mValue;
}
@Override
public void setValue(Object value) {
mValue = value;
mHasValue = (value != null);
......@@ -296,10 +298,12 @@ public abstract class Keyframe implements Cloneable {
return mValue;
}
@Override
public Object getValue() {
return mValue;
}
@Override
public void setValue(Object value) {
if (value != null && value.getClass() == Integer.class) {
mValue = ((Integer)value).intValue();
......@@ -340,10 +344,12 @@ public abstract class Keyframe implements Cloneable {
return mValue;
}
@Override
public Object getValue() {
return mValue;
}
@Override
public void setValue(Object value) {
if (value != null && value.getClass() == Float.class) {
mValue = ((Float)value).floatValue();
......
......@@ -507,6 +507,7 @@ public class ValueAnimator extends Animator {
* value makes it easier to compose statements together that construct and then set the
* duration, as in <code>ValueAnimator.ofInt(0, 10).setDuration(500).start()</code>.
*/
@Override
public ValueAnimator setDuration(long duration) {
if (duration < 0) {
throw new IllegalArgumentException("Animators cannot have negative duration: " +
......@@ -521,6 +522,7 @@ public class ValueAnimator extends Animator {
*
* @return The length of the animation, in milliseconds.
*/
@Override
public long getDuration() {
return mDuration;
}
......@@ -690,6 +692,7 @@ public class ValueAnimator extends Animator {
*
* @return the number of milliseconds to delay running the animation
*/
@Override
public long getStartDelay() {
return mStartDelay;
}
......@@ -700,6 +703,7 @@ public class ValueAnimator extends Animator {
* @param startDelay The amount of the delay, in milliseconds
*/
@Override
public void setStartDelay(long startDelay) {
this.mStartDelay = startDelay;
}
......
......@@ -34,6 +34,7 @@ public abstract class NineViewGroup extends ViewGroup {
super.setVisibility(visibility);
}
@Override
public float getAlpha() {
if (AnimatorProxy.NEEDS_PROXY) {
return mProxy.getAlpha();
......@@ -41,6 +42,7 @@ public abstract class NineViewGroup extends ViewGroup {
return super.getAlpha();
}
}
@Override
public void setAlpha(float alpha) {
if (AnimatorProxy.NEEDS_PROXY) {
mProxy.setAlpha(alpha);
......@@ -48,6 +50,7 @@ public abstract class NineViewGroup extends ViewGroup {
super.setAlpha(alpha);
}
}
@Override
public float getTranslationX() {
if (AnimatorProxy.NEEDS_PROXY) {
return mProxy.getTranslationX();
......@@ -55,6 +58,7 @@ public abstract class NineViewGroup extends ViewGroup {
return super.getTranslationX();
}
}
@Override
public void setTranslationX(float translationX) {
if (AnimatorProxy.NEEDS_PROXY) {
mProxy.setTranslationX(translationX);
......@@ -62,6 +66,7 @@ public abstract class NineViewGroup extends ViewGroup {
super.setTranslationX(translationX);
}
}
@Override
public float getTranslationY() {
if (AnimatorProxy.NEEDS_PROXY) {
return mProxy.getTranslationY();
......@@ -69,6 +74,7 @@ public abstract class NineViewGroup extends ViewGroup {
return super.getTranslationY();
}
}
@Override
public void setTranslationY(float translationY) {
if (AnimatorProxy.NEEDS_PROXY) {
mProxy.setTranslationY(translationY);
......
......@@ -26,6 +26,7 @@ public class NineFrameLayout extends FrameLayout {
super.setVisibility(visibility);
}
@Override
public float getAlpha() {
if (AnimatorProxy.NEEDS_PROXY) {
return mProxy.getAlpha();
......@@ -33,6 +34,7 @@ public class NineFrameLayout extends FrameLayout {
return super.getAlpha();
}
}
@Override
public void setAlpha(float alpha) {
if (AnimatorProxy.NEEDS_PROXY) {
mProxy.setAlpha(alpha);
......@@ -40,6 +42,7 @@ public class NineFrameLayout extends FrameLayout {
super.setAlpha(alpha);
}
}
@Override