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

Develop #1

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Develop #1

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d7ea1c
changed button txt
Arya04 Oct 22, 2018
8b65c11
changed colors
Arya04 Oct 22, 2018
b42e75d
initialized buttons
Arya04 Oct 23, 2018
1eb601d
added intents to go to new page
Arya04 Oct 23, 2018
a3d2b97
added simple layout to testing page
Arya04 Oct 25, 2018
d390984
added credentials and dependencies for google calendar
Arya04 Oct 29, 2018
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
4 changes: 4 additions & 0 deletions app/src/main/res/layout/activity_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="Training"
android:textAllCaps="false"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't there a way to define all of these properties as a default set, so you don't need to redefine these each time?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure what you mean.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@msaperst i think maybe in the style/themes you can set a style that can be used by all buttons or something if thats what you mean

android:background="@color/coverosPrimary"
app:layout_constraintBottom_toTopOf="@+id/testingButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -60,6 +62,8 @@
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="Testing"
android:textAllCaps="false"
android:background="@color/coverosPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
13 changes: 7 additions & 6 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 @@ -17,13 +17,13 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:background="@color/colorPrimaryDark"
android:background="@color/coverosPrimary"
android:hint="@string/hint_account"
android:inputType="textEmailAddress"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/white"
android:textColorHint="#ffff25e6"
android:textColorHint="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
Expand All @@ -41,13 +41,13 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:background="@color/colorPrimaryDark"
android:background="@color/coverosPrimary"
android:hint="@string/hint_password"
android:inputType="textPassword"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/white"
android:textColorHint="#ffff25e6"
android:textColorHint="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
Expand All @@ -66,8 +66,9 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:background="@color/colorPrimaryDark"
android:background="@color/coverosPrimary"
android:text="@string/btn_login"
android:textAllCaps="false"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -87,7 +88,7 @@
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@color/colorPrimaryDark"
android:background="@color/coverosPrimary"
android:text="@string/btn_link_to_register"
android:textAllCaps="false"
android:textColor="@color/white"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
<color name="colorPrimaryDark">#2e0057</color>
<color name="colorAccent">#D81B60</color>
<color name="white">#ffffffff</color>
<color name="coverosPrimary">#276bcf</color>
<color name="hintColorPink">#ffff25e6</color>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks wrong, why 8 chars, not 6?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idk, the color showed up, i just used the color scale thing and picked the color which gave me the output.

<color name="grey">#837f82</color>
</resources>
2 changes: 1 addition & 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 @@ -2,6 +2,6 @@
<string name="app_name">TrainingApp</string>
<string name="hint_password">Enter Password</string>
<string name="hint_account">Enter Email</string>
<string name="btn_login">Submit</string>
<string name="btn_login">Login</string>
<string name="btn_link_to_register">Register</string>
</resources>
4 changes: 2 additions & 2 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 @@ -3,8 +3,8 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimary">@color/grey</item>
<item name="colorPrimaryDark">@color/coverosPrimary</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

Expand Down