Skip to content

Commit

Permalink
minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kwfk committed May 23, 2016
1 parent 51b2c62 commit 04ac144
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 62 deletions.
Binary file modified .gradle/2.10/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file modified .gradle/2.10/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/2.10/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified .gradle/2.10/taskArtifacts/taskArtifacts.bin
Binary file not shown.
53 changes: 27 additions & 26 deletions .idea/workspace.xml

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

75 changes: 39 additions & 36 deletions app/src/main/res/layout/settings_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,44 +67,47 @@
android:textColor="#FFFFFF" />

<!--displays the table of the history-->
<TableLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/table"
android:layout_gravity="center">
<TableRow
android:scrollbars="none">
<TableLayout
android:layout_width="match_parent"
android:background="#C5C5C5">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyDate"
android:textSize="18sp"
android:text="Date"
android:paddingLeft="5dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyLesson"
android:textSize="18sp"
android:text="Lesson"
android:paddingLeft="20dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyProb"
android:textSize="18sp"
android:text="Problems"
android:paddingLeft="20dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyScore"
android:textSize="18sp"
android:text="Score"
android:paddingLeft="15dp"/>
</TableRow>
</TableLayout>

android:layout_height="wrap_content"
android:id="@+id/table">
<TableRow
android:layout_width="match_parent"
android:background="#C5C5C5">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyDate"
android:textSize="18sp"
android:text="Date"
android:paddingLeft="5dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyLesson"
android:textSize="18sp"
android:text="Lesson"
android:paddingLeft="20dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyProb"
android:textSize="18sp"
android:text="Problems"
android:paddingLeft="20dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/historyScore"
android:textSize="18sp"
android:text="Score"
android:paddingLeft="15dp"/>
</TableRow>
</TableLayout>

</ScrollView>
</LinearLayout>

0 comments on commit 04ac144

Please sign in to comment.