Skip to content

Sign in logo update #46

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 2 commits into from
Nov 22, 2019
Merged

Sign in logo update #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6da98d0
.idea files modified when Dev updated was pulled
sajafisher29 Nov 22, 2019
525b076
Main Page UI getting closer! Logo now on signin and button for user page
sajafisher29 Nov 22, 2019
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
Binary file modified .idea/caches/build_file_checksums.ser
View file
Open in desktop
Binary file not shown.
Binary file modified .idea/caches/gradle_models.ser
View file
Open in desktop
Binary file not shown.
16 changes: 7 additions & 9 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 @@ -159,24 +159,22 @@ public void onFailure(@Nonnull ApolloException e) {
}
}

///////////// Go to user page ///////////////////
public void goToUserPage(View view){
Intent goToUserPage = new Intent(this, UserProfile.class);
this.startActivity(goToUserPage);
}

//////// TEST BUTTON /////
public void onTestyClick(View view) {
startActivity(new Intent(MainActivity.this, NotificationActivity.class));
}

///////////// Turn on Camera ///////////////////
public void goToCameraClass(View view){
Intent goToCamera = new Intent(this, ShowMeYourFace.class);
this.startActivity(goToCamera);
}

/////////////

// Direct users to sign in page
private void signInUser() {
AWSMobileClient.getInstance().showSignIn(MainActivity.this,
// customize the built in sign in page
SignInUIOptions.builder().backgroundColor(16763080).build(),
SignInUIOptions.builder().backgroundColor(16763080).logo(R.drawable.zombieicon).build(),
new Callback<UserStateDetails>() {
@Override
public void onResult(UserStateDetails result) {
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/java/com/javaawesome/tag/UserProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import androidx.appcompat.app.AppCompatActivity;

import android.content.Intent;
import android.os.Bundle;
import android.view.View;

public class UserProfile extends AppCompatActivity {

Expand All @@ -11,4 +13,11 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_profile);
}

///////////// Turn on Camera ///////////////////
public void goToCameraClass(View view){
Intent goToCamera = new Intent(this, ShowMeYourFace.class);
this.startActivity(goToCamera);
}

}
51 changes: 34 additions & 17 deletions 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 @@ -5,6 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
tools:context=".MainActivity">

<Button
Expand All @@ -22,15 +23,16 @@
android:id="@+id/mainActivitiyHeading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/welcome"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@+id/editText_session_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/signoutButton" />
app:layout_constraintTop_toBottomOf="@+id/signoutButton"
app:layout_constraintVertical_bias="1.0" />

<Button
android:id="@+id/goToMapButton"
Expand All @@ -57,42 +59,57 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/mainActivitiyHeading" />

<TextView
android:id="@+id/recyclerChooseCurrentGamePrompt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/choose_current_game_prompt"
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/recycler_nearby_sessions"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/goToMapButton" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_nearby_sessions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/camera"
android:elevation="12dp"
android:clipToPadding="false"
app:layout_constraintBottom_toTopOf="@+id/userPageButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/goToMapButton" />

<Button
android:id="@+id/camera"
android:id="@+id/userPageButton"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/photo_camera"
android:onClick="goToCameraClass"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@mipmap/ic_launcher_round"
android:onClick="goToUserPage"
app:layout_constraintBottom_toTopOf="@id/userProfileHeading"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.952"
app:layout_constraintHorizontal_bias="0.971"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/recycler_nearby_sessions" />

<TextView
android:id="@+id/recyclerChooseCurrentGamePrompt"
android:id="@+id/userProfileHeading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/choose_current_game_prompt"
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/recycler_nearby_sessions"
android:layout_marginEnd="16dp"
android:gravity="center|center_horizontal"
android:outlineProvider="bounds"
android:text="@string/user_profile_prompt"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.971"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/goToMapButton" />
app:layout_constraintTop_toBottomOf="@+id/userPageButton" />

</androidx.constraintlayout.widget.ConstraintLayout>
35 changes: 22 additions & 13 deletions app/src/main/res/layout/activity_user_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,35 @@
android:layout_height="match_parent"
tools:context=".UserProfile">

<ImageView
android:id="@+id/imageView"
android:layout_width="195dp"
android:layout_height="259dp"
android:layout_marginStart="108dp"
android:layout_marginTop="200dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@tools:sample/avatars" />

<TextView
android:id="@+id/UserName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="144dp"
android:text="username"
app:layout_constraintBottom_toTopOf="@+id/cameraButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/cameraButton"
android:layout_width="75dp"
android:layout_height="75dp"
android:background="@drawable/photo_camera"
android:onClick="goToCameraClass"
app:layout_constraintBottom_toTopOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/UserName" />

<ImageView
android:id="@+id/imageView"
android:layout_width="195dp"
android:layout_height="259dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cameraButton"
tools:srcCompat="@tools:sample/avatars" />

</androidx.constraintlayout.widget.ConstraintLayout>
28 changes: 14 additions & 14 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 @@ -16,20 +16,20 @@
android:ellipsize="end"
android:text="@string/session_title"
app:layout_constraintStart_toStartOf="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_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="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_constraintStart_toEndOf="@+id/session_title"/>
<!-- <TextView-->
<!-- android:id="@+id/session_total_players"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="8dp"-->
<!-- 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_constraintStart_toEndOf="@+id/session_title"/>-->

</androidx.constraintlayout.widget.ConstraintLayout>
18 changes: 9 additions & 9 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 @@ -17,14 +17,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<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/number_of_players"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <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/number_of_players"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->

</androidx.constraintlayout.widget.ConstraintLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<string name="session_title">Session Title</string>
<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="choose_current_game_prompt">Test your survival in a current game:</string>
<string name="number_of_players">Population: </string>
<string name="session_name"></string>
<string name="user_profile_prompt">User Profile</string>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<item name="android:colorBackground">@color/backgroundTint</item>
<item name="colorButtonNormal">@color/colorPrimary</item>
<item name="colorControlHighlight">@color/secondaryLightColor</item>
<item name="android:textColor">@color/primaryTextColor</item>
<item name="android:textColorSecondary">@color/secondaryTextColor</item>
<!-- <item name="android:fontFamily">@font/INFECTED</item>-->
</style>

Expand Down