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.

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

contribued_challenges_results_quizzes #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ dependencies {
implementation "com.android.support:support-annotations:27.1.1"
implementation 'com.github.bumptech.glide:glide:4.7.1'
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
implementation 'de.hdodenhof:circleimageview:2.2.0'
compile 'com.android.support:cardview-v7:+'
}
apply plugin: 'com.google.gms.google-services'
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
</vector>
485 changes: 479 additions & 6 deletions app/src/main/res/layout/fragment_challenges.xml

Large diffs are not rendered by default.

484 changes: 479 additions & 5 deletions app/src/main/res/layout/fragment_quizzes.xml

Large diffs are not rendered by default.

484 changes: 479 additions & 5 deletions app/src/main/res/layout/fragment_results.xml

Large diffs are not rendered by default.

49 changes: 48 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,57 @@
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>


<!-- strings for challenge fragment-->
<string name="challenge1">Challenge Name 1</string>
<string name="challenge2">Challenge Name 2</string>
<string name="challenge3">Challenge Name 3</string>
<string name="challenge4">Challenge Name 4</string>
<string name="challenge5">Challenge Name 5</string>
<string name="challenge6">Challenge Name 6</string>
<string name="challenge7">Challenge Name 7</string>
<string name="challenge8">Challenge Name 8</string>
<string name="challenge9">Challenge Name 9</string>
<string name="challenge10">Challenge Name 10</string>
<string name="moderator">Moderator Name</string>
<string name="end_date">End date: Not yet announced</string>
<string name="start">Go</string>


<!-- strings for quizzes fragment-->
<string name="quiz1">Quiz Name 1</string>
<string name="quiz2">Quiz Name 2</string>
<string name="quiz3">Quiz Name 3</string>
<string name="quiz4">Quiz Name 4</string>
<string name="quiz5">Quiz Name 5</string>
<string name="quiz6">Quiz Name 6</string>
<string name="quiz7">Quiz Name 7</string>
<string name="quiz8">Quiz Name 8</string>
<string name="quiz9">Quiz Name 9</string>
<string name="quiz10">Quiz Name 10</string>
<string name="qstart">Start Quiz</string>


<!-- strings for results fragment-->
<string name="result1">Quiz/Challenge Name 1</string>
<string name="result2">Quiz/Challenge Name 2</string>
<string name="result3">Quiz/Challenge Name 3</string>
<string name="result4">Quiz/Challenge Name 4</string>
<string name="result5">Quiz/Challenge Name 5</string>
<string name="result6">Quiz/Challenge Name 6</string>
<string name="result7">Quiz/Challenge Name 7</string>
<string name="result8">Quiz/Challenge Name 8</string>
<string name="result9">Quiz/Challenge Name 9</string>
<string name="result10">Quiz/Challenge Name 10</string>
<string name="rupdate">updated on:need to update</string>
<string name="show">Open</string>



<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="settings_title">Settings</string>
<string name="login_welcome_title" >Welcome to Audacity</string>
<string name="login_welcome_title">Welcome to Audacity</string>
<string name="home">Home</string>
<string name="hello">Hello</string>
</resources>
19 changes: 19 additions & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,23 @@
</style>

<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />

<!--cardstyle-->
<style name="cardStyle" parent="CardView">
<item name="android:layout_margin">4dp</item>
<item name="cardCornerRadius">6dp</item>
<item name="cardElevation">4dp</item>
</style>

<!--challenge name style-->
<style name="AppTheme.cTextStyle" >
<item name="android:textSize">17sp</item>
<item name="android:layout_marginLeft">10dp</item>
</style>

<style name="AppTheme.mTextStyle" >
<item name="android:textSize">15sp</item>
<item name="android:layout_marginLeft">10dp</item>
<item name="android:textColor">#80000000</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
org.gradle.jvmargs=-Xmx1024m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down