Skip to content

Added apk #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sajafisher29 merged 1 commit into from
Nov 21, 2019
Merged

Added apk #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/InfectionTheme">
<activity android:name=".AboutUs"></activity>
<activity android:name=".NotificationActivity" />

<service android:name="org.eclipse.paho.android.service.MqttService" />
Expand Down
14 changes: 0 additions & 14 deletions app/src/main/java/com/javaawesome/tag/AboutUs.java
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions app/src/main/java/com/javaawesome/tag/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import androidx.core.app.ActivityCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.Manifest;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
Expand All @@ -18,7 +16,6 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.provider.Settings;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
Expand Down Expand Up @@ -69,17 +66,13 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);


getApplicationContext().startService(new Intent(getApplicationContext(), TransferService.class));



if (this.checkSelfPermission(ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED ||
this.checkSelfPermission(ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(this, new String[]{ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION}, 10);
}


// initialize aws mobile client and check if you are logged in or not
AWSMobileClient.getInstance().initialize(getApplicationContext(), new Callback<UserStateDetails>() {
@Override
Expand Down Expand Up @@ -120,7 +113,7 @@ protected void onResume() {
super.onResume();
Log.i(TAG, "onresume called");
if (checkGpsStatus()) {
// getCurrentUserLocation();
getCurrentUserLocation();
checkIfPlayerAlreadyExistInDatabase();
} else {
buildAlertMessageNoGps();
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/javaawesome/tag/SessionAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ public void onClick(DialogInterface dialog, int which) {
return holder;
};


public static class SessionViewHolder extends RecyclerView.ViewHolder {

ListSessionsQuery.Item session;
TextView sessionTitle;
// TextView numberOfPlayers;

public SessionViewHolder(@NonNull View itemView) {
super(itemView);
this.sessionTitle = itemView.findViewById(R.id.session_title);
Expand All @@ -68,8 +68,8 @@ public SessionViewHolder(@NonNull View itemView) {
public void onBindViewHolder(@NonNull SessionAdapter.SessionViewHolder holder, int position) {
ListSessionsQuery.Item sessionAtPosition = this.sessions.get(position);
holder.session = sessionAtPosition;
holder.sessionTitle.setText("Title: " + sessionAtPosition.title());
// holder.numberOfPlayers.setText("Players: " + sessionAtPosition);
holder.sessionTitle.setText(sessionAtPosition.title());
// holder.numberOfPlayers.setText("Population: " + sessionAtPosition.players());
}

@Override
Expand Down
16 changes: 0 additions & 16 deletions app/src/main/res/layout/activity_about_us.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:onClick="goToMap"
android:text="Start New Game"
android:text="@string/start_new_game_button"
app:layout_constraintBottom_toTopOf="@+id/recycler_nearby_sessions"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
15 changes: 9 additions & 6 deletions app/src/main/res/layout/fragment_recycler_view_sessions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,25 @@
android:id="@+id/session_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="@string/session_title"
android:ellipsize="end"
android:text="@string/session_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/session_total_players"/>

<TextView
android:id="@+id/session_total_players"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
android:text="@string/session_total_players"
android:layout_marginEnd="16dp"
android:ellipsize="end"
android:text="@string/session_total_players"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/session_title"/>

</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/recyler_view_sessions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
android:text="Session title"
android:text="@string/session_name"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand All @@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
android:text="Session Total Players"
android:text="@string/number_of_players"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@
<string name="session_total_players">Session Total Players</string>
<string name="welcome">Welcome to Zombie Tag!\nHow long can you survive?\nStart or join a game below.</string>
<string name="choose_current_game_prompt">Test your survival skills with a current game listed below</string>
<string name="number_of_players">Population: </string>
<string name="session_name"></string>
</resources>
1 change: 1 addition & 0 deletions output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]