Skip to content

Commit

Permalink
Stying for summary
Browse files Browse the repository at this point in the history
  • Loading branch information
@avalax
avalax committed Dec 30, 2017
1 parent 533a9b7 commit 5b9803f
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/main/java/de/avalax/fitbuddy/presentation/summary/FinishedWorkoutAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static class ViewHolder extends RecyclerView.ViewHolder {

ViewHolder(View v) {
super(v);
titleTextView = v.findViewById(R.id.finished_workout_title);
titleTextView = v.findViewById(R.id.item_title);
}

TextView getTitleTextView() {
Expand Down
5 changes: 5 additions & 0 deletions src/main/res/drawable/ic_icon_neutral.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:viewportHeight="207.0"
android:viewportWidth="207.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000"
android:pathData="M43.2,54.3c-2.1,2.2 -2.2,3.2 -2.2,21 0,16 -0.2,18.7 -1.5,18.7 -1.2,0 -1.5,-1.9 -1.5,-11.3 0,-10.6 -0.2,-11.5 -2.3,-13.5 -3,-2.8 -4.8,-2.8 -7.5,0.1 -2,2.1 -2.2,3.4 -2.2,13.5l0,11.2 -11.3,0c-13.1,0 -14.7,0.8 -14.7,7.7 0,6.5 1.7,7.3 14.8,7.3l11.2,0 0,12.8c0,12.1 0.1,13 2.3,15 3,2.8 4.8,2.8 7.5,-0.1 2,-2.1 2.2,-3.4 2.2,-15 0,-10.6 0.2,-12.7 1.5,-12.7 1.3,0 1.5,2.8 1.5,18.8 0,18.4 0.1,18.9 2.3,21 3.1,2.9 7.7,2.9 10.5,-0.1 2.1,-2.2 2.2,-3.2 2.2,-21 0,-15.6 0.2,-18.7 1.4,-18.7 0.9,0 1.6,1.2 1.8,2.7l0.3,2.8 43,0 43,0 0.3,-2.8c0.2,-1.5 0.9,-2.7 1.8,-2.7 1.2,0 1.4,3.1 1.4,18.8 0,18.4 0.1,18.9 2.3,21 3.1,2.9 7.7,2.9 10.5,-0.1 2.1,-2.2 2.2,-3.2 2.2,-21 0,-16 0.2,-18.7 1.5,-18.7 1.3,0 1.5,2.1 1.5,12.8 0,12.1 0.1,13 2.3,15 3,2.8 4.8,2.8 7.5,-0.1 2,-2.1 2.2,-3.4 2.2,-15l0,-12.7 11.4,0c8.9,0 11.6,-0.3 12.6,-1.5 0.7,-0.8 1.9,-1.5 2.6,-1.5 1,0 1.4,-1.3 1.4,-4.5 0,-3.2 -0.4,-4.5 -1.4,-4.5 -0.7,0 -1.9,-0.7 -2.6,-1.5 -1,-1.2 -3.7,-1.5 -12.6,-1.5l-11.4,0 0,-11.3c0,-10.6 -0.2,-11.5 -2.3,-13.5 -3,-2.8 -4.8,-2.8 -7.5,0.1 -2,2.1 -2.2,3.4 -2.2,13.5 0,9.3 -0.3,11.2 -1.5,11.2 -1.3,0 -1.5,-2.8 -1.5,-18.8 0,-18.4 -0.1,-18.9 -2.3,-21 -3.1,-2.9 -7.7,-2.9 -10.5,0.1 -2.1,2.2 -2.2,3.2 -2.2,21 0,15.6 -0.2,18.7 -1.4,18.7 -0.9,0 -1.6,-1.2 -1.8,-2.8l-0.3,-2.7 -43,0 -43,0 -0.3,2.7c-0.2,1.6 -0.9,2.8 -1.8,2.8 -1.2,0 -1.4,-3.1 -1.4,-18.8 0,-18.4 -0.1,-18.9 -2.3,-21 -3.1,-2.9 -7.7,-2.9 -10.5,0.1z" android:strokeColor="#00000000"/>
</vector>
5 changes: 2 additions & 3 deletions src/main/res/layout/activity_edit_exercise.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginEnd="30dp"
android:background="@color/primaryColor"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/edit_exercise_toolbar_cancel"
android:focusable="true"
android:onClick="onCancelButtonClick"
android:src="@drawable/ic_action_close"
android:theme="@style/AppTheme.ActionBarButton" />
android:src="@drawable/ic_action_close" />

<TextView
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
Expand Down
5 changes: 2 additions & 3 deletions src/main/res/layout/activity_edit_set.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginEnd="30dp"
android:background="@color/primaryColor"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/edit_exercise_toolbar_cancel"
android:focusable="true"
android:onClick="onCancelButtonClick"
android:src="@drawable/ic_action_close"
android:theme="@style/AppTheme.ActionBarButton" />
android:src="@drawable/ic_action_close" />

<TextView
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
Expand Down
5 changes: 2 additions & 3 deletions src/main/res/layout/activity_edit_workout.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginEnd="30dp"
android:background="@color/primaryColor"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/edit_exercise_toolbar_cancel"
android:focusable="true"
android:onClick="onCancelButtonClick"
android:src="@drawable/ic_action_close"
android:theme="@style/AppTheme.ActionBarButton" />
android:src="@drawable/ic_action_close" />

<TextView
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
Expand Down
31 changes: 20 additions & 11 deletions src/main/res/layout/item_finished_workout.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight">
android:layout_height="72dp"
android:paddingEnd="16dp"
android:paddingStart="16dp"
android:paddingTop="20dp">

<TextView
android:id="@+id/finished_workout_title"
android:id="@+id/item_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:hint="@string/placeholder_title"
android:textColor="?android:textColorPrimary"
android:textSize="14sp" />
android:textSize="16sp"
tools:ignore="RelativeOverlap" />

<TextView
android:id="@+id/finished_workout_date"
android:id="@+id/item_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/finished_workout_title"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_below="@+id/item_title"
android:hint="@string/placeholder_subtitle"
android:textColor="?android:textColorSecondary"
android:textSize="14sp" />

<ImageButton
android:id="@+id/item_tendency"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_icon_neutral"
android:contentDescription="@string/summary_tendency" />
</RelativeLayout>
1 change: 1 addition & 0 deletions src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@
<string name="reps_suffix">reps</string>
<string name="weight_suffix">kg</string>
<string name="edit_set_toolbar_title">Edit set</string>
<string name="summary_tendency">tendency</string>
</resources>
6 changes: 0 additions & 6 deletions src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,5 @@
<style name="AppTheme.ActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:background">@color/primaryColor</item>
<item name="actionMenuTextColor">@color/primaryTextColor</item>
<item name="android:imageButtonStyle">@style/AppTheme.ActionBarButton</item>
</style>

<style name="AppTheme.ActionBarButton">
<item name="android:tint">@color/primaryTextColor</item>
<item name="android:background">@color/primaryColor</item>
</style>`
</resources>

0 comments on commit 5b9803f

Please sign in to comment.