Skip to content
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

Update dashboard #4

Merged
merged 13 commits into from
Jan 4, 2022
Merged

Update dashboard #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8486d47
Preliminary floating action button and recycle view layout
RileyKenyon Dec 31, 2021
d79e05f
First pass at adding data classes for player and games
RileyKenyon Dec 31, 2021
08afc89
First pass at recyclerView
RileyKenyon Dec 31, 2021
e42d1c1
Updated navigation view to have a nav_header with an image
RileyKenyon Jan 1, 2022
15e6f87
Updated game item format
RileyKenyon Jan 1, 2022
6f53c91
Removed section on using the firebase emulator
RileyKenyon Jan 2, 2022
8621937
Updated game icons to reflect active status, sorted by status and name
RileyKenyon Jan 3, 2022
8f03d86
Updated the UI to use dark/light theme values
RileyKenyon Jan 3, 2022
d63e7b0
Updated the .idea folder
RileyKenyon Jan 3, 2022
5be94bf
Added model for recyler view of games
RileyKenyon Jan 3, 2022
ca2e31e
Updated .idea
RileyKenyon Jan 4, 2022
2200fd4
Updated appbar to use appropriate theme day/night
RileyKenyon Jan 4, 2022
c7bab1b
Updated github workflow file with entry point to resolve build issue
RileyKenyon Jan 4, 2022
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
Next Next commit
Preliminary floating action button and recycle view layout
  • Loading branch information
@RileyKenyon
RileyKenyon committed Dec 31, 2021
commit 8486d4777deec690e42ca6e243864adc9bfb39ae
4 changes: 4 additions & 0 deletions DungeonsandDragons/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion DungeonsandDragons/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {
targetSdkVersion 30
versionCode 1
versionName "1.0"

vectorDrawables.useSupportLibrary = true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
41 changes: 33 additions & 8 deletions DungeonsandDragons/app/src/main/res/layout/fragment_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,46 @@

<TextView
android:id="@+id/welcomeMessage"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@string/welcome_back"
android:textAlignment="textStart"
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.100000024" />

<Button
android:id="@+id/signoutButton"
android:layout_width="wrap_content"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/gameRecyclerView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Go to NFC"
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:background="#FFF3E0"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintHorizontal_bias="0.177"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/welcomeMessage" />
app:layout_constraintTop_toBottomOf="@+id/welcomeMessage"
app:layout_constraintVertical_bias="0.0" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="32dp"
android:contentDescription="@string/fab_content_description"
android:src="@drawable/fui_ic_anonymous_white_24dp"
app:backgroundTint="@color/dark_red"
app:fabSize="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />


</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions DungeonsandDragons/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
<string name="sign_out">sign out</string>
<string name="dummy_text">dummy text</string>
<string name="settings">settings</string>
<string name="fab_content_description">fab</string>
</resources>