Commit c8db4911 authored by Ethan Liang's avatar Ethan Liang
Browse files

Merge remote-tracking branch 'origin/top-secret' into top-secret

parents e38c8f2f becb892e

.gradle/7.5/checksums/checksums.lock

(17 B)

File changed.

No diff preview for this file type.

View original file
View changed file

app/src/main/AndroidManifest.xml

+11 −3
Original line number Diff line number Diff line
@@ -11,6 +11,14 @@ 
        android:supportsRtl="true"

        android:theme="@style/Theme.Game2D"

        tools:targetApi="31">

        <activity

            android:name=".ChalkGameRIPActivity"

            android:exported="false"

            android:screenOrientation="landscape"/>

        <activity

            android:name=".ChalkToQuizActivity"

            android:exported="false"

            android:screenOrientation="landscape" />

        <activity

            android:name=".QuizToChalkActivity"

            android:exported="false"
@@ -81,11 +89,11 @@ 
        <activity

            android:name=".ChalkQuizPause"

            android:exported="false"

            android:screenOrientation="landscape"></activity>

            android:screenOrientation="landscape" />

        <activity

            android:name=".NamePause"

            android:exported="false"

            android:screenOrientation="landscape"></activity>

            android:screenOrientation="landscape" />

        <activity

            android:name=".NameActivity"

            android:exported="true"

app/src/main/java/com/example/game2d/ChalkGameClass.java

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import android.graphics.Matrix; 
import android.media.MediaPlayer;

import android.view.MotionEvent;

import android.view.View;

import "ChalkActivity.java";



public class ChalkGameClass extends View {

    //PLAYER