Skip to content

Commit

Permalink
cannot add youself, added animated request button on home screen(need…
Browse files Browse the repository at this point in the history
…s to be activated when a friend or challenge request is made)
  • Loading branch information
puntubabu committed Jul 22, 2014
1 parent 21955f4 commit c55d1bc
Show file tree
Hide file tree
Showing 33 changed files with 36 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Quizdom/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.breanawiggins.quizdom">

<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="19"/>

<uses-permission android:name="android.permission.INTERNET"/>
<permission android:name="com.breanawiggins.quizdom.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
Expand Down
2 changes: 1 addition & 1 deletion Quizdom/bin/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.breanawiggins.quizdom">

<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="19"/>

<uses-permission android:name="android.permission.INTERNET"/>
<permission android:name="com.breanawiggins.quizdom.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
Expand Down
Binary file modified Quizdom/bin/Quizdom.apk
Binary file not shown.
1 change: 1 addition & 0 deletions Quizdom/bin/R.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ int anim abc_slide_in_bottom 0x7f040002
int anim abc_slide_in_top 0x7f040003
int anim abc_slide_out_bottom 0x7f040004
int anim abc_slide_out_top 0x7f040005
int anim anim_scale 0x7f040006
int attr actionBarDivider 0x7f01000f
int attr actionBarItemBackground 0x7f010010
int attr actionBarSize 0x7f01000e
Expand Down
Binary file modified Quizdom/bin/classes.dex
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/HomeScreen.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$anim.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$attr.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$bool.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$color.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$dimen.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$drawable.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$id.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$integer.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$layout.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$menu.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$string.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$style.class
Binary file not shown.
Binary file modified Quizdom/bin/classes/com/breanawiggins/quizdom/R$styleable.class
Binary file not shown.
Binary file modified Quizdom/bin/resources.ap_
Binary file not shown.
1 change: 1 addition & 0 deletions Quizdom/gen/com/breanawiggins/quizdom/R.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public static final class anim {
public static final int abc_slide_in_top=0x7f040003;
public static final int abc_slide_out_bottom=0x7f040004;
public static final int abc_slide_out_top=0x7f040005;
public static final int anim_scale=0x7f040006;
}
public static final class attr {
/** Custom divider drawable to use for elements in the action bar.
Expand Down
14 changes: 14 additions & 0 deletions Quizdom/res/anim/anim_scale.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/linear_interpolator">
<scale
android:fromXScale="1.0"
android:toXScale="1.5"
android:fromYScale="1.0"
android:toYScale="1.5"
android:pivotX="50%"
android:pivotY="50%"
android:duration="500"
android:repeatCount="infinite"
android:repeatMode="reverse" />
</set>
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ protected String doInBackground(String... args) {
String strUser = user.get("name");
String friend = etFriend.getText().toString();

if (!strUser.equals(friend)){
try {
// Building Parameters
ArrayList<NameValuePair> params = new ArrayList<NameValuePair>();
Expand Down Expand Up @@ -127,6 +128,14 @@ protected String doInBackground(String... args) {
} catch (JSONException e) {
e.printStackTrace();
}
}
else{
runOnUiThread(new Runnable() {
public void run() {
Toast.makeText(FriendsListActivity.this, "Can't Add Yourself!", Toast.LENGTH_LONG).show();
}
});
}

return null;

Expand Down
14 changes: 9 additions & 5 deletions Quizdom/src/com/breanawiggins/quizdom/HomeScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import java.util.HashMap;

import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;

Expand All @@ -18,8 +19,7 @@ public class HomeScreen extends ActionBarActivity {
ImageButton btnLogin, btnSignUp;
TextView tvCurrentUser;
public static UserSessionManager session;


Button requestButton;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -28,8 +28,12 @@ protected void onCreate(Bundle savedInstanceState) {
session = new UserSessionManager(getApplicationContext());
tvCurrentUser = (TextView)findViewById(R.id.tvCurrentUser);
setCurrentUserText();
final Animation animScale = AnimationUtils.loadAnimation(this, R.anim.anim_scale);
requestButton = (Button) findViewById(R.id.btnRequest);
requestButton.startAnimation(animScale);

}

private void setCurrentUserText(){
HashMap<String, String> user = new HashMap<String, String>();
user = session.getUserDetails();
Expand Down

0 comments on commit c55d1bc

Please sign in to comment.