Commit 89d2db5e3d0a118845158878ddb0d0f0d4c2b753
1 parent
790fc3bf2b
Exists in
master
update file png icon
Showing 2 changed files with 11 additions and 3 deletions Inline Diff
app/src/main/res/drawable/category.PNG
app/src/main/res/layout/fragment_top_today.xml
| 1 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 1 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 2 | xmlns:appNs="http://schemas.android.com/apk/res-auto" | 2 | xmlns:appNs="http://schemas.android.com/apk/res-auto" |
| 3 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent"> | 4 | android:layout_height="match_parent"> |
| 5 | 5 | ||
| 6 | <ScrollView | 6 | <ScrollView |
| 7 | android:layout_width="match_parent" | 7 | android:layout_width="match_parent" |
| 8 | android:layout_height="match_parent" | 8 | android:layout_height="match_parent" |
| 9 | android:layout_alignParentTop="true" | 9 | android:layout_alignParentTop="true" |
| 10 | android:layout_alignParentStart="true" | 10 | android:layout_alignParentStart="true" |
| 11 | android:layout_above="@+id/ll_stepType"> | 11 | android:layout_above="@+id/ll_stepType"> |
| 12 | 12 | ||
| 13 | <LinearLayout | 13 | <LinearLayout |
| 14 | android:layout_width="match_parent" | 14 | android:layout_width="match_parent" |
| 15 | android:layout_height="wrap_content" | 15 | android:layout_height="wrap_content" |
| 16 | android:orientation="vertical" | 16 | android:orientation="vertical" |
| 17 | android:padding="10dp"> | 17 | android:padding="10dp"> |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | <LinearLayout | 20 | <LinearLayout |
| 21 | android:layout_width="match_parent" | 21 | android:layout_width="match_parent" |
| 22 | android:layout_height="wrap_content" | 22 | android:layout_height="wrap_content" |
| 23 | android:orientation="horizontal" | 23 | android:orientation="horizontal" |
| 24 | android:paddingTop="10dp"> | 24 | android:paddingTop="10dp"> |
| 25 | 25 | ||
| 26 | <ImageView | 26 | <ImageView |
| 27 | android:id="@+id/iv_back" | 27 | android:id="@+id/iv_back" |
| 28 | android:layout_width="@dimen/next_date_height" | 28 | android:layout_width="@dimen/next_date_height" |
| 29 | android:layout_height="@dimen/next_date_height" | 29 | android:layout_height="@dimen/next_date_height" |
| 30 | android:src="@drawable/back_ic" /> | 30 | android:src="@drawable/back_ic" /> |
| 31 | 31 | ||
| 32 | <TextView | 32 | <TextView |
| 33 | android:id="@+id/tv_date" | 33 | android:id="@+id/tv_date" |
| 34 | android:layout_width="0dp" | 34 | android:layout_width="0dp" |
| 35 | android:layout_height="match_parent" | 35 | android:layout_height="match_parent" |
| 36 | android:layout_weight="1.0" | 36 | android:layout_weight="1.0" |
| 37 | android:gravity="center" | 37 | android:gravity="center" |
| 38 | android:text="2017年1月1日" | 38 | android:text="2017年1月1日" |
| 39 | android:textColor="@color/white" | 39 | android:textColor="@color/white" |
| 40 | android:textSize="23sp" /> | 40 | android:textSize="23sp" /> |
| 41 | 41 | ||
| 42 | <ImageView | 42 | <ImageView |
| 43 | android:id="@+id/iv_next" | 43 | android:id="@+id/iv_next" |
| 44 | android:layout_width="@dimen/next_date_height" | 44 | android:layout_width="@dimen/next_date_height" |
| 45 | android:layout_height="@dimen/next_date_height" | 45 | android:layout_height="@dimen/next_date_height" |
| 46 | android:src="@drawable/next_ic" /> | 46 | android:src="@drawable/next_ic" /> |
| 47 | 47 | ||
| 48 | </LinearLayout> | 48 | </LinearLayout> |
| 49 | 49 | ||
| 50 | <LinearLayout | 50 | <LinearLayout |
| 51 | android:layout_width="match_parent" | 51 | android:layout_width="match_parent" |
| 52 | android:layout_height="wrap_content" | 52 | android:layout_height="wrap_content" |
| 53 | android:orientation="horizontal" | 53 | android:orientation="horizontal" |
| 54 | android:paddingTop="10dp" | 54 | android:paddingTop="10dp" |
| 55 | android:weightSum="100"> | 55 | android:weightSum="100"> |
| 56 | 56 | ||
| 57 | <LinearLayout | 57 | <LinearLayout |
| 58 | android:layout_width="0dp" | 58 | android:layout_width="0dp" |
| 59 | android:layout_height="wrap_content" | 59 | android:layout_height="wrap_content" |
| 60 | android:layout_weight="15" | 60 | android:layout_weight="15" |
| 61 | android:orientation="vertical"> | 61 | android:orientation="vertical"> |
| 62 | 62 | ||
| 63 | <ImageView | 63 | <ImageView |
| 64 | android:layout_width="match_parent" | 64 | android:layout_width="match_parent" |
| 65 | android:layout_height="wrap_content" | 65 | android:layout_height="wrap_content" |
| 66 | android:src="@drawable/goout_ic" | 66 | android:src="@drawable/goout_ic" |
| 67 | android:adjustViewBounds="true"/> | 67 | android:adjustViewBounds="true"/> |
| 68 | 68 | ||
| 69 | <ImageView | 69 | <ImageView |
| 70 | android:layout_width="match_parent" | 70 | android:layout_width="match_parent" |
| 71 | android:layout_height="wrap_content" | 71 | android:layout_height="wrap_content" |
| 72 | android:src="@drawable/ic_face" | 72 | android:src="@drawable/ic_face" |
| 73 | android:adjustViewBounds="true" | 73 | android:adjustViewBounds="true" |
| 74 | android:paddingTop="6dp"/> | 74 | android:paddingTop="6dp"/> |
| 75 | 75 | ||
| 76 | <ImageView | 76 | <ImageView |
| 77 | android:layout_width="match_parent" | 77 | android:layout_width="match_parent" |
| 78 | android:layout_height="wrap_content" | 78 | android:layout_height="wrap_content" |
| 79 | android:src="@drawable/ic_line" | 79 | android:src="@drawable/ic_line" |
| 80 | android:adjustViewBounds="true" | 80 | android:adjustViewBounds="true" |
| 81 | android:paddingTop="10dp"/> | 81 | android:paddingTop="10dp"/> |
| 82 | 82 | ||
| 83 | </LinearLayout> | 83 | </LinearLayout> |
| 84 | 84 | ||
| 85 | <RelativeLayout | 85 | <RelativeLayout |
| 86 | android:layout_width="0dp" | 86 | android:layout_width="0dp" |
| 87 | android:layout_height="wrap_content" | 87 | android:layout_height="wrap_content" |
| 88 | android:layout_weight="60" | 88 | android:layout_weight="60" |
| 89 | android:paddingLeft="10dp"> | 89 | android:paddingLeft="10dp"> |
| 90 | 90 | ||
| 91 | <org.eazegraph.lib.charts.PieChart | 91 | <org.eazegraph.lib.charts.PieChart |
| 92 | xmlns:eaze="http://schemas.android.com/apk/res-auto" | 92 | xmlns:eaze="http://schemas.android.com/apk/res-auto" |
| 93 | android:id="@+id/graph" | 93 | android:id="@+id/graph" |
| 94 | android:layout_width="match_parent" | 94 | android:layout_width="match_parent" |
| 95 | android:layout_height="200dp" | 95 | android:layout_height="200dp" |
| 96 | android:layout_marginTop="10dp" | 96 | android:layout_marginTop="10dp" |
| 97 | eaze:egLegendHeight="0dp" | 97 | eaze:egLegendHeight="0dp" |
| 98 | eaze:egInnerPadding="93" | 98 | eaze:egInnerPadding="93" |
| 99 | eaze:egInnerPaddingColor="@color/bg_main" | 99 | eaze:egInnerPaddingColor="@color/bg_main" |
| 100 | eaze:egHighlightStrength="1"/> | 100 | eaze:egHighlightStrength="1"/> |
| 101 | 101 | ||
| 102 | <LinearLayout | 102 | <LinearLayout |
| 103 | android:layout_width="match_parent" | 103 | android:layout_width="match_parent" |
| 104 | android:layout_height="200dp" | 104 | android:layout_height="200dp" |
| 105 | android:layout_marginTop="10dp" | 105 | android:layout_marginTop="10dp" |
| 106 | android:orientation="vertical" | 106 | android:orientation="vertical" |
| 107 | android:gravity="center_horizontal"> | 107 | android:gravity="center_horizontal"> |
| 108 | 108 | ||
| 109 | <ImageView | 109 | <ImageView |
| 110 | android:layout_width="@dimen/walking_img_height" | 110 | android:layout_width="@dimen/walking_img_height" |
| 111 | android:layout_height="@dimen/walking_img_height" | 111 | android:layout_height="@dimen/walking_img_height" |
| 112 | android:layout_marginTop="25dp" | 112 | android:layout_marginTop="25dp" |
| 113 | android:gravity="center" | 113 | android:gravity="center" |
| 114 | android:src="@drawable/walking_ic"/> | 114 | android:src="@drawable/walking_ic"/> |
| 115 | 115 | ||
| 116 | <TextView | 116 | <TextView |
| 117 | android:id="@+id/steps" | 117 | android:id="@+id/steps" |
| 118 | android:layout_width="match_parent" | 118 | android:layout_width="match_parent" |
| 119 | android:layout_height="wrap_content" | 119 | android:layout_height="wrap_content" |
| 120 | android:gravity="center" | 120 | android:gravity="center" |
| 121 | android:textSize="45sp" | 121 | android:textSize="45sp" |
| 122 | android:text="10.000" | 122 | android:text="10.000" |
| 123 | android:textColor="@color/white"/> | 123 | android:textColor="@color/white"/> |
| 124 | 124 | ||
| 125 | <TextView | 125 | <TextView |
| 126 | android:id="@+id/tv_smallStepGoal" | 126 | android:id="@+id/tv_smallStepGoal" |
| 127 | android:layout_width="wrap_content" | 127 | android:layout_width="wrap_content" |
| 128 | android:layout_height="wrap_content" | 128 | android:layout_height="wrap_content" |
| 129 | android:text="@string/pie_text_content1" | 129 | android:text="@string/pie_text_content1" |
| 130 | android:textSize="14sp" | 130 | android:textSize="14sp" |
| 131 | android:padding="4dp" | 131 | android:padding="4dp" |
| 132 | android:textColor="@color/white"/> | 132 | android:textColor="@color/white"/> |
| 133 | 133 | ||
| 134 | <TextView | 134 | <TextView |
| 135 | android:layout_width="wrap_content" | 135 | android:layout_width="wrap_content" |
| 136 | android:layout_height="wrap_content" | 136 | android:layout_height="wrap_content" |
| 137 | android:text="@string/pie_text_content2" | 137 | android:text="@string/pie_text_content2" |
| 138 | android:textSize="14sp" | 138 | android:textSize="14sp" |
| 139 | android:textColor="@color/white"/> | 139 | android:textColor="@color/white"/> |
| 140 | 140 | ||
| 141 | <TextView | 141 | <TextView |
| 142 | android:id="@+id/tv_smallRemain" | 142 | android:id="@+id/tv_smallRemain" |
| 143 | android:layout_width="wrap_content" | 143 | android:layout_width="wrap_content" |
| 144 | android:layout_height="wrap_content" | 144 | android:layout_height="wrap_content" |
| 145 | android:layout_below="@+id/steps" | 145 | android:layout_below="@+id/steps" |
| 146 | android:layout_centerHorizontal="true" | 146 | android:layout_centerHorizontal="true" |
| 147 | android:text="@string/pie_text_content3" | 147 | android:text="@string/pie_text_content3" |
| 148 | android:textSize="14sp" | 148 | android:textSize="14sp" |
| 149 | android:textColor="@color/white"/> | 149 | android:textColor="@color/white"/> |
| 150 | 150 | ||
| 151 | </LinearLayout> | 151 | </LinearLayout> |
| 152 | 152 | ||
| 153 | </RelativeLayout> | 153 | </RelativeLayout> |
| 154 | 154 | ||
| 155 | <LinearLayout | 155 | <LinearLayout |
| 156 | android:layout_width="0dp" | 156 | android:layout_width="0dp" |
| 157 | android:layout_height="wrap_content" | 157 | android:layout_height="wrap_content" |
| 158 | android:layout_weight="25" | 158 | android:layout_weight="25" |
| 159 | android:gravity="center" | 159 | android:gravity="center" |
| 160 | android:orientation="vertical"> | 160 | android:orientation="vertical"> |
| 161 | 161 | ||
| 162 | <TextView | 162 | <TextView |
| 163 | android:layout_width="wrap_content" | 163 | android:layout_width="wrap_content" |
| 164 | android:layout_height="wrap_content" | 164 | android:layout_height="wrap_content" |
| 165 | android:text="@string/goal_jp" | 165 | android:text="@string/goal_jp" |
| 166 | android:textColor="@color/white" | 166 | android:textColor="@color/white" |
| 167 | android:textSize="16sp" /> | 167 | android:textSize="16sp" /> |
| 168 | 168 | ||
| 169 | <TextView | 169 | <TextView |
| 170 | android:id="@+id/tv_stepGoal" | 170 | android:id="@+id/tv_stepGoal" |
| 171 | android:layout_width="wrap_content" | 171 | android:layout_width="wrap_content" |
| 172 | android:layout_height="wrap_content" | 172 | android:layout_height="wrap_content" |
| 173 | android:paddingLeft="10dp" | 173 | android:paddingLeft="10dp" |
| 174 | android:text="10000歩" | 174 | android:text="10000歩" |
| 175 | android:textColor="@color/white" | 175 | android:textColor="@color/white" |
| 176 | android:textSize="16sp" /> | 176 | android:textSize="16sp" /> |
| 177 | 177 | ||
| 178 | <TextView | 178 | <TextView |
| 179 | android:layout_width="wrap_content" | 179 | android:layout_width="wrap_content" |
| 180 | android:layout_height="wrap_content" | 180 | android:layout_height="wrap_content" |
| 181 | android:paddingTop="10dp" | 181 | android:paddingTop="10dp" |
| 182 | android:text="@string/remaining_number_step" | 182 | android:text="@string/remaining_number_step" |
| 183 | android:textColor="@color/white" | 183 | android:textColor="@color/white" |
| 184 | android:textSize="16sp" /> | 184 | android:textSize="16sp" /> |
| 185 | 185 | ||
| 186 | <TextView | 186 | <TextView |
| 187 | android:id="@+id/tv_stepRemain" | 187 | android:id="@+id/tv_stepRemain" |
| 188 | android:layout_width="wrap_content" | 188 | android:layout_width="wrap_content" |
| 189 | android:layout_height="wrap_content" | 189 | android:layout_height="wrap_content" |
| 190 | android:paddingLeft="10dp" | 190 | android:paddingLeft="10dp" |
| 191 | android:text="3000歩" | 191 | android:text="3000歩" |
| 192 | android:textColor="@color/white" | 192 | android:textColor="@color/white" |
| 193 | android:textSize="16sp" /> | 193 | android:textSize="16sp" /> |
| 194 | 194 | ||
| 195 | <TextView | 195 | <TextView |
| 196 | android:layout_width="wrap_content" | 196 | android:layout_width="wrap_content" |
| 197 | android:layout_height="wrap_content" | 197 | android:layout_height="wrap_content" |
| 198 | android:paddingTop="10dp" | 198 | android:paddingTop="10dp" |
| 199 | android:text="@string/achiverment_rate" | 199 | android:text="@string/achiverment_rate" |
| 200 | android:textColor="@color/white" | 200 | android:textColor="@color/white" |
| 201 | android:textSize="16sp" /> | 201 | android:textSize="16sp" /> |
| 202 | 202 | ||
| 203 | <TextView | 203 | <TextView |
| 204 | android:id="@+id/tv_stepRateDone" | 204 | android:id="@+id/tv_stepRateDone" |
| 205 | android:layout_width="wrap_content" | 205 | android:layout_width="wrap_content" |
| 206 | android:layout_height="wrap_content" | 206 | android:layout_height="wrap_content" |
| 207 | android:paddingLeft="10dp" | 207 | android:paddingLeft="10dp" |
| 208 | android:text="78%" | 208 | android:text="78%" |
| 209 | android:textColor="@color/white" | 209 | android:textColor="@color/white" |
| 210 | android:textSize="16sp" /> | 210 | android:textSize="16sp" /> |
| 211 | 211 | ||
| 212 | </LinearLayout> | 212 | </LinearLayout> |
| 213 | 213 | ||
| 214 | </LinearLayout> | 214 | </LinearLayout> |
| 215 | 215 | ||
| 216 | <LinearLayout | 216 | <LinearLayout |
| 217 | android:layout_width="match_parent" | 217 | android:layout_width="match_parent" |
| 218 | android:layout_height="wrap_content" | 218 | android:layout_height="wrap_content" |
| 219 | android:weightSum="100" | 219 | android:weightSum="100" |
| 220 | android:paddingTop="20dp" | 220 | android:paddingTop="20dp" |
| 221 | android:orientation="horizontal"> | 221 | android:orientation="horizontal"> |
| 222 | 222 | ||
| 223 | <LinearLayout | 223 | <LinearLayout |
| 224 | android:layout_width="0dp" | 224 | android:layout_width="0dp" |
| 225 | android:layout_height="wrap_content" | 225 | android:layout_height="wrap_content" |
| 226 | android:layout_weight="10" | 226 | android:layout_weight="10" |
| 227 | android:gravity="center" | 227 | android:gravity="center" |
| 228 | android:orientation="vertical"> | 228 | android:orientation="vertical"> |
| 229 | 229 | ||
| 230 | </LinearLayout> | 230 | </LinearLayout> |
| 231 | 231 | ||
| 232 | <LinearLayout | 232 | <LinearLayout |
| 233 | android:layout_width="0dp" | 233 | android:layout_width="0dp" |
| 234 | android:layout_height="wrap_content" | 234 | android:layout_height="wrap_content" |
| 235 | android:layout_weight="20" | 235 | android:layout_weight="20" |
| 236 | android:gravity="center" | 236 | android:gravity="center" |
| 237 | android:orientation="vertical"> | 237 | android:orientation="vertical"> |
| 238 | 238 | ||
| 239 | <ImageView | 239 | <ImageView |
| 240 | android:layout_width="wrap_content" | 240 | android:layout_width="wrap_content" |
| 241 | android:layout_height="wrap_content" | 241 | android:layout_height="wrap_content" |
| 242 | android:src="@drawable/category" | 242 | android:src="@drawable/category" |
| 243 | android:adjustViewBounds="true"/> | 243 | android:adjustViewBounds="true"/> |
| 244 | 244 | ||
| 245 | </LinearLayout> | 245 | </LinearLayout> |
| 246 | 246 | ||
| 247 | <LinearLayout | 247 | <LinearLayout |
| 248 | android:layout_width="0dp" | 248 | android:layout_width="0dp" |
| 249 | android:layout_height="wrap_content" | 249 | android:layout_height="wrap_content" |
| 250 | android:layout_weight="30" | 250 | android:layout_weight="30" |
| 251 | android:gravity="center" | 251 | android:gravity="center" |
| 252 | android:orientation="vertical"> | 252 | android:orientation="vertical"> |
| 253 | 253 | ||
| 254 | <TextView | 254 | <TextView |
| 255 | android:id="@+id/tv_distance" | 255 | android:id="@+id/tv_distance" |
| 256 | android:layout_width="wrap_content" | 256 | android:layout_width="wrap_content" |
| 257 | android:layout_height="wrap_content" | 257 | android:layout_height="wrap_content" |
| 258 | android:text="4.9" | 258 | android:text="4.9" |
| 259 | android:textColor="@color/white" | 259 | android:textColor="@color/white" |
| 260 | android:textSize="22sp" /> | 260 | android:textSize="22sp" /> |
| 261 | 261 | ||
| 262 | </LinearLayout> | 262 | </LinearLayout> |
| 263 | 263 | ||
| 264 | <LinearLayout | 264 | <LinearLayout |
| 265 | android:layout_width="0dp" | 265 | android:layout_width="0dp" |
| 266 | android:layout_height="wrap_content" | 266 | android:layout_height="wrap_content" |
| 267 | android:layout_weight="30" | 267 | android:layout_weight="30" |
| 268 | android:gravity="center" | 268 | android:gravity="center" |
| 269 | android:orientation="vertical"> | 269 | android:orientation="vertical"> |
| 270 | 270 | ||
| 271 | <TextView | 271 | <TextView |
| 272 | android:id="@+id/tv_time" | 272 | android:id="@+id/tv_time" |
| 273 | android:layout_width="wrap_content" | 273 | android:layout_width="wrap_content" |
| 274 | android:layout_height="wrap_content" | 274 | android:layout_height="wrap_content" |
| 275 | android:text="1:09" | 275 | android:text="1:09" |
| 276 | android:textColor="@color/white" | 276 | android:textColor="@color/white" |
| 277 | android:textSize="22sp" /> | 277 | android:textSize="22sp" /> |
| 278 | 278 | ||
| 279 | </LinearLayout> | 279 | </LinearLayout> |
| 280 | 280 | ||
| 281 | <LinearLayout | 281 | <LinearLayout |
| 282 | android:layout_width="0dp" | 282 | android:layout_width="0dp" |
| 283 | android:layout_height="wrap_content" | 283 | android:layout_height="wrap_content" |
| 284 | android:layout_weight="10" | 284 | android:layout_weight="10" |
| 285 | android:gravity="center" | 285 | android:gravity="center" |
| 286 | android:orientation="vertical"> | 286 | android:orientation="vertical"> |
| 287 | 287 | ||
| 288 | <ImageView | 288 | <ImageView |
| 289 | android:layout_width="@dimen/next_date_height" | 289 | android:layout_width="@dimen/next_date_height" |
| 290 | android:layout_height="wrap_content" | 290 | android:layout_height="wrap_content" |
| 291 | android:src="@drawable/pause" | 291 | android:src="@drawable/pause" |
| 292 | android:background="@color/white" | 292 | android:background="@color/white" |
| 293 | android:adjustViewBounds="true" | 293 | android:adjustViewBounds="true" |
| 294 | android:visibility="gone"/> | 294 | android:visibility="gone"/> |
| 295 | 295 | ||
| 296 | </LinearLayout> | 296 | </LinearLayout> |
| 297 | </LinearLayout> | 297 | </LinearLayout> |
| 298 | 298 | ||
| 299 | <LinearLayout | 299 | <LinearLayout |
| 300 | android:layout_width="match_parent" | 300 | android:layout_width="match_parent" |
| 301 | android:layout_height="wrap_content" | 301 | android:layout_height="wrap_content" |
| 302 | android:weightSum="100" | 302 | android:weightSum="100" |
| 303 | android:orientation="horizontal"> | 303 | android:orientation="horizontal"> |
| 304 | 304 | ||
| 305 | <LinearLayout | 305 | <LinearLayout |
| 306 | android:layout_width="0dp" | 306 | android:layout_width="0dp" |
| 307 | android:layout_height="wrap_content" | 307 | android:layout_height="wrap_content" |
| 308 | android:layout_weight="20" | 308 | android:layout_weight="10" |
| 309 | android:gravity="center" | 309 | android:gravity="center" |
| 310 | android:orientation="vertical"> | 310 | android:orientation="vertical"> |
| 311 | 311 | ||
| 312 | </LinearLayout> | 312 | </LinearLayout> |
| 313 | 313 | ||
| 314 | <LinearLayout | 314 | <LinearLayout |
| 315 | android:layout_width="0dp" | 315 | android:layout_width="0dp" |
| 316 | android:layout_height="wrap_content" | 316 | android:layout_height="wrap_content" |
| 317 | android:layout_weight="20" | 317 | android:layout_weight="20" |
| 318 | android:gravity="center" | 318 | android:gravity="center" |
| 319 | android:orientation="vertical"> | 319 | android:orientation="vertical"> |
| 320 | 320 | ||
| 321 | <TextView | 321 | <TextView |
| 322 | android:layout_width="wrap_content" | 322 | android:layout_width="wrap_content" |
| 323 | android:layout_height="wrap_content" | 323 | android:layout_height="wrap_content" |
| 324 | android:text="@string/carori" | 324 | android:text="@string/carori" |
| 325 | android:textColor="@color/white" | 325 | android:textColor="@color/white" |
| 326 | android:textSize="16sp" /> | 326 | android:textSize="16sp" /> |
| 327 | 327 | ||
| 328 | </LinearLayout> | 328 | </LinearLayout> |
| 329 | 329 | ||
| 330 | <LinearLayout | 330 | <LinearLayout |
| 331 | android:layout_width="0dp" | 331 | android:layout_width="0dp" |
| 332 | android:layout_height="wrap_content" | 332 | android:layout_height="wrap_content" |
| 333 | android:layout_weight="20" | 333 | android:layout_weight="30" |
| 334 | android:gravity="center" | 334 | android:gravity="center" |
| 335 | android:orientation="vertical"> | 335 | android:orientation="vertical"> |
| 336 | 336 | ||
| 337 | <TextView | 337 | <TextView |
| 338 | android:layout_width="wrap_content" | 338 | android:layout_width="wrap_content" |
| 339 | android:layout_height="wrap_content" | 339 | android:layout_height="wrap_content" |
| 340 | android:text="@string/km" | 340 | android:text="@string/km" |
| 341 | android:textColor="@color/white" | 341 | android:textColor="@color/white" |
| 342 | android:textSize="16sp" /> | 342 | android:textSize="16sp" /> |
| 343 | 343 | ||
| 344 | </LinearLayout> | 344 | </LinearLayout> |
| 345 | 345 | ||
| 346 | <LinearLayout | 346 | <LinearLayout |
| 347 | android:layout_width="0dp" | 347 | android:layout_width="0dp" |
| 348 | android:layout_height="wrap_content" | 348 | android:layout_height="wrap_content" |
| 349 | android:layout_weight="20" | 349 | android:layout_weight="30" |
| 350 | android:gravity="center" | 350 | android:gravity="center" |
| 351 | android:orientation="vertical"> | 351 | android:orientation="vertical"> |
| 352 | 352 | ||
| 353 | <TextView | 353 | <TextView |
| 354 | android:layout_width="wrap_content" | 354 | android:layout_width="wrap_content" |
| 355 | android:layout_height="wrap_content" | 355 | android:layout_height="wrap_content" |
| 356 | android:text="@string/time" | 356 | android:text="@string/time" |
| 357 | android:textColor="@color/white" | 357 | android:textColor="@color/white" |
| 358 | android:textSize="16sp" /> | 358 | android:textSize="16sp" /> |
| 359 | |||
| 360 | </LinearLayout> | ||
| 361 | <LinearLayout | ||
| 362 | android:layout_width="0dp" | ||
| 363 | android:layout_height="wrap_content" | ||
| 364 | android:layout_weight="10" | ||
| 365 | android:gravity="center" | ||
| 366 | android:orientation="vertical"> | ||
| 359 | 367 | ||
| 360 | </LinearLayout> | 368 | </LinearLayout> |
| 361 | </LinearLayout> | 369 | </LinearLayout> |
| 362 | 370 | ||
| 363 | 371 | ||
| 364 | <LinearLayout | 372 | <LinearLayout |
| 365 | android:layout_width="match_parent" | 373 | android:layout_width="match_parent" |
| 366 | android:layout_height="120dp" | 374 | android:layout_height="120dp" |
| 367 | android:orientation="vertical" | 375 | android:orientation="vertical" |
| 368 | android:layout_marginTop="10dp"> | 376 | android:layout_marginTop="10dp"> |
| 369 | 377 | ||
| 370 | <!--<org.eazegraph.lib.charts.BarChart--> | 378 | <!--<org.eazegraph.lib.charts.BarChart--> |
| 371 | <!--xmlns:eaze="http://schemas.android.com/apk/res-auto"--> | 379 | <!--xmlns:eaze="http://schemas.android.com/apk/res-auto"--> |
| 372 | <!--android:id="@+id/bargraph"--> | 380 | <!--android:id="@+id/bargraph"--> |
| 373 | <!--android:layout_width="match_parent"--> | 381 | <!--android:layout_width="match_parent"--> |
| 374 | <!--android:layout_height="120dp"--> | 382 | <!--android:layout_height="120dp"--> |
| 375 | <!--android:layout_below="@+id/averageandtotaltext"--> | 383 | <!--android:layout_below="@+id/averageandtotaltext"--> |
| 376 | <!--eaze:egLegendHeight="0dp"--> | 384 | <!--eaze:egLegendHeight="0dp"--> |
| 377 | <!--eaze:egShowValues="false" />--> | 385 | <!--eaze:egShowValues="false" />--> |
| 378 | <com.github.mikephil.charting.charts.BarChart | 386 | <com.github.mikephil.charting.charts.BarChart |
| 379 | android:id="@+id/chart" | 387 | android:id="@+id/chart" |
| 380 | android:layout_width="match_parent" | 388 | android:layout_width="match_parent" |
| 381 | android:layout_height="match_parent" /> | 389 | android:layout_height="match_parent" /> |
| 382 | 390 | ||
| 383 | 391 | ||
| 384 | </LinearLayout> | 392 | </LinearLayout> |
| 385 | 393 | ||
| 386 | 394 | ||
| 387 | </LinearLayout> | 395 | </LinearLayout> |
| 388 | </ScrollView> | 396 | </ScrollView> |
| 389 | 397 | ||
| 390 | <include layout="@layout/type_step" /> | 398 | <include layout="@layout/type_step" /> |
| 391 | </RelativeLayout> | 399 | </RelativeLayout> |
| 392 | 400 |