Skip to content

Commit

Permalink
scoreboard added, notice before quiz,null handling in score
Browse files Browse the repository at this point in the history
  • Loading branch information
@keyuls
keyuls committed Mar 25, 2016
1 parent 14e39ff commit 81302b2
Show file tree
Hide file tree
Showing 12 changed files with 316 additions and 202 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
applicationId "com.quizfloor.quizfloor"
minSdkVersion 9
targetSdkVersion 22
versionCode 4
versionCode 5
versionName "1.0"
renderscriptTargetApi 9
renderscriptSupportModeEnabled true
Expand Down
128 changes: 74 additions & 54 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.quizfloor.quizfloor" >
package="com.quizfloor.quizfloor">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />

<!-- Permission to get DeviceId -->
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" />

<!--
IMPORTANT: Change "com.parse.starter.permission.C2D_MESSAGE" in the lines below
to match your app's package name + ".permission.C2D_MESSAGE".
-->
<permission android:protectionLevel="signature"
android:name="com.quizfloor.quizfloor.permission.C2D_MESSAGE" />
<permission
android:name="com.quizfloor.quizfloor.permission.C2D_MESSAGE"
android:protectionLevel="signature" />

<uses-permission android:name="com.quizfloor.quizfloor.permission.C2D_MESSAGE" />

<!-- This app has permission to register and receive data message. -->
<uses-permission
android:name="com.google.android.c2dm.permission.RECEIVE"/>

<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />

<application
android:name=".quizFloorApplication"
android:allowBackup="true"
android:icon="@drawable/symbol"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
android:theme="@style/AppTheme">
<activity
android:name=".openingLogo"
android:label="@string/app_name" >
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".loginWithFacebook"
android:label="@string/title_activity_login_with_facebook"
android:screenOrientation="portrait">

<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="quizfloor" />
</intent-filter>
</activity>
Expand All @@ -66,94 +67,103 @@
<activity
android:name=".selectCatagory"
android:label="@string/title_activity_select_catagory"
android:screenOrientation="portrait">
</activity>
android:screenOrientation="portrait"></activity>
<activity
android:name=".showQuestion"
android:label="@string/title_activity_show_question"
android:screenOrientation="portrait"
>
</activity>
android:screenOrientation="portrait"></activity>
<activity
android:name=".submitQuestion"
android:label="@string/title_activity_submit_question"
android:screenOrientation="portrait"
android:parentActivityName="com.quizfloor.quizfloor.selectCatagory" >
<!-- Parent activity meta-data to support 4.0 and lower-->
android:parentActivityName=".selectCatagory"
android:screenOrientation="portrait">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.quizfloor.quizfloor.selectCatagory" />
</activity>
<activity
android:name=".categoryListActivity"
android:label="@string/title_activity_category_list"
android:screenOrientation="portrait"
android:parentActivityName="com.quizfloor.quizfloor.selectCatagory" >
<!-- Parent activity meta-data to support 4.0 and lower-->
android:parentActivityName=".selectCatagory"
android:screenOrientation="portrait">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.quizfloor.quizfloor.selectCatagory" />
</activity>
<!-- <activity
<!--
<activity
android:name=".challengeListAdapter"
android:label="@string/title_activity_challenge_list_adapter" >
</activity>-->
</activity>
-->
<activity
android:name=".showChallenges"
android:label="@string/title_activity_show_challenges"
android:screenOrientation="portrait"
android:parentActivityName="com.quizfloor.quizfloor.selectCatagory" >
<!-- Parent activity meta-data to support 4.0 and lower-->
android:parentActivityName=".selectCatagory"
android:screenOrientation="portrait">

<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.quizfloor.quizfloor.selectCatagory" />
</activity>
<activity
android:name=".ShowSubCatagory"
android:label="@string/title_activity_show_sub_catagory"
android:screenOrientation="portrait"
android:parentActivityName="com.quizfloor.quizfloor.categoryListActivity" >
android:parentActivityName=".categoryListActivity"
android:screenOrientation="portrait">

<!-- Parent activity meta-data to support 4.0 and lower-->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.quizfloor.quizfloor.categoryListActivity" />
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.quizfloor.quizfloor.categoryListActivity" />
</activity>

<!--<activity
<!--
<activity
android:name=".subCatagoryListAdapter"
android:label="@string/title_activity_sub_catagory_list_adapter" >
</activity>-->

</activity>
-->


<!-- <service android:name="com.parse.PushService" />
<!--
<service android:name="com.parse.PushService" />
<receiver android:name="com.parse.GcmBroadcastReceiver"
android:permission="com.google.android.c2dm.permission.SEND">
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" /> -->
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-->

<!--
IMPORTANT: Change "com.parse.starter" to match your app's package name.
-->
<!-- <category android:name="com.quizfloor.quizfloor" />
</intent-filter>
</receiver> -->

<!-- IMPORTANT: Change "com.parse.starter" to match your app's package name. -->
<!--
<category android:name="com.quizfloor.quizfloor" />
</intent-filter>
</receiver>
-->

<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />

<activity android:name="com.pushwoosh.richpages.RichPageActivity" />
<activity android:name="com.pushwoosh.MessageActivity" />
<activity android:name="com.pushwoosh.PushHandlerActivity" />

<receiver android:name="com.pushwoosh.local.AlarmReceiver" />
<receiver
android:name="com.google.android.gms.gcm.GcmReceiver"
android:exported="true"
android:permission="com.google.android.c2dm.permission.SEND" >
android:permission="com.google.android.c2dm.permission.SEND">
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />

<category android:name="com.quizfloor.quizfloor" />
</intent-filter>
</receiver>
Expand All @@ -162,32 +172,42 @@
android:name="com.pushwoosh.GCMListenerService"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE"/>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
</intent-filter>
</service>

<service
android:name="com.pushwoosh.GCMInstanceIDListenerService"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.gms.iid.InstanceID"/>
<action android:name="com.google.android.gms.iid.InstanceID" />
</intent-filter>
</service>

<service
android:name="com.pushwoosh.GCMRegistrationService"
android:exported="false">
</service>
android:exported="false"></service>

<meta-data
android:name="com.parse.APPLICATION_ID"
android:value="64ywb2cyyKZvFCkv1nSIYosbbPQTnM2EfU3AWPWi" />
<meta-data
android:name="com.parse.CLIENT_KEY"
android:value="6MCsFJw6TpaN3EoD3nYgdshBD7Jfn9u7P6mM5KBw" />
<meta-data
android:name="PW_APPID"
android:value="E13C8-08B5F" />
<meta-data
android:name="PW_PROJECT_ID"
android:value="A686193657719" />

<meta-data android:name="PW_APPID" android:value="E13C8-08B5F" />
<meta-data android:name="PW_PROJECT_ID" android:value="A686193657719" />
<activity
android:name=".scoreBoardDisplay"
android:label="@string/title_activity_score_board_display"
android:theme="@style/AppTheme.NoActionBar"
android:parentActivityName=".selectCatagory">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.quizfloor.quizfloor.selectCatagory" />
</activity>

</application>

Expand Down
37 changes: 36 additions & 1 deletion app/src/main/java/com/quizfloor/quizfloor/ShowSubCatagory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

import android.annotation.TargetApi;
import android.app.ActionBar;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Build;
import android.os.Handler;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -14,6 +17,7 @@
import android.widget.GridView;
import android.widget.ListView;

import com.facebook.share.model.GameRequestContent;
import com.parse.FunctionCallback;
import com.parse.ParseCloud;
import com.parse.ParseObject;
Expand Down Expand Up @@ -62,11 +66,42 @@ public void onItemClick(AdapterView<?> parent, final View view,
ParseObject clickedUser = subCatObj.get(position);
String selectedSubCatagory = (String) clickedUser.get("DbName");
((quizFloorApplication) getApplicationContext()).setSelectedSubCatagory(selectedSubCatagory);
goToShowQuestion();
showNotice();

}
});
}

private void showNotice() {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
this);

// set title
alertDialogBuilder.setTitle("Rules");

// set dialog message
alertDialogBuilder
.setMessage("You are going into quiz mode now. Answer five questions to score well.")
.setCancelable(false)
.setPositiveButton("Play", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
goToShowQuestion();
}
})
.setNegativeButton("Not Now", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
// if this button is clicked, just close
// the dialog box and do nothing
dialog.cancel();

}
});
// create alert dialog

AlertDialog dialog = alertDialogBuilder.create();
dialog.show();
}

private void goToShowQuestion() {

((quizFloorApplication) getApplicationContext()).setChallengeMode(false);
Expand Down
Loading

0 comments on commit 81302b2

Please sign in to comment.