diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1f0c75b..059e650 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,7 +28,6 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/InfectionTheme"> - diff --git a/app/src/main/java/com/javaawesome/tag/AboutUs.java b/app/src/main/java/com/javaawesome/tag/AboutUs.java deleted file mode 100644 index adcf867..0000000 --- a/app/src/main/java/com/javaawesome/tag/AboutUs.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.javaawesome.tag; - -import androidx.appcompat.app.AppCompatActivity; - -import android.os.Bundle; - -public class AboutUs extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_about_us); - } -} diff --git a/app/src/main/java/com/javaawesome/tag/MainActivity.java b/app/src/main/java/com/javaawesome/tag/MainActivity.java index 9c08a25..20a577e 100644 --- a/app/src/main/java/com/javaawesome/tag/MainActivity.java +++ b/app/src/main/java/com/javaawesome/tag/MainActivity.java @@ -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; @@ -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; @@ -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() { @Override @@ -120,7 +113,7 @@ protected void onResume() { super.onResume(); Log.i(TAG, "onresume called"); if (checkGpsStatus()) { -// getCurrentUserLocation(); + getCurrentUserLocation(); checkIfPlayerAlreadyExistInDatabase(); } else { buildAlertMessageNoGps(); diff --git a/app/src/main/java/com/javaawesome/tag/SessionAdapter.java b/app/src/main/java/com/javaawesome/tag/SessionAdapter.java index 45ef785..7a93f5d 100644 --- a/app/src/main/java/com/javaawesome/tag/SessionAdapter.java +++ b/app/src/main/java/com/javaawesome/tag/SessionAdapter.java @@ -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); @@ -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 diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml deleted file mode 100644 index d36c666..0000000 --- a/app/src/main/res/layout/activity_about_us.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 487a3a8..9d13e7b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -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" diff --git a/app/src/main/res/layout/fragment_recycler_view_sessions.xml b/app/src/main/res/layout/fragment_recycler_view_sessions.xml index 68e1c7f..15a5fde 100644 --- a/app/src/main/res/layout/fragment_recycler_view_sessions.xml +++ b/app/src/main/res/layout/fragment_recycler_view_sessions.xml @@ -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"/> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toEndOf="@+id/session_title"/> \ No newline at end of file diff --git a/app/src/main/res/layout/recyler_view_sessions.xml b/app/src/main/res/layout/recyler_view_sessions.xml index cf389ec..2f77e02 100644 --- a/app/src/main/res/layout/recyler_view_sessions.xml +++ b/app/src/main/res/layout/recyler_view_sessions.xml @@ -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" /> @@ -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" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 382b446..747877a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,4 +9,6 @@ Session Total Players Welcome to Zombie Tag!\nHow long can you survive?\nStart or join a game below. Test your survival skills with a current game listed below + Population: + diff --git a/output.json b/output.json new file mode 100644 index 0000000..92a0784 --- /dev/null +++ b/output.json @@ -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":{}}] \ No newline at end of file