open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
0057d46b 1 parent dcf414db

cosmote intent dl fixes

Inline Side-by-side
Showing 4 changed files with 284 additions and 200 deletions
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.4.6rc63' 5 + PUBLISH_VERSION = '4.5.4.6rc64'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -22,6 +22,7 @@ import android.view.WindowManager; ...@@ -22,6 +22,7 @@ import android.view.WindowManager;
22 import android.widget.EditText; 22 import android.widget.EditText;
23 import android.widget.ImageView; 23 import android.widget.ImageView;
24 import android.widget.LinearLayout; 24 import android.widget.LinearLayout;
25 +import android.widget.RelativeLayout;
25 import android.widget.TextView; 26 import android.widget.TextView;
26 27
27 import androidx.annotation.NonNull; 28 import androidx.annotation.NonNull;
...@@ -90,6 +91,7 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -90,6 +91,7 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
90 private String mStartTimestamp = "", mStopTimestamp = ""; 91 private String mStartTimestamp = "", mStopTimestamp = "";
91 private final int RECORDS_INTERVAL = 5000; 92 private final int RECORDS_INTERVAL = 5000;
92 private EditText mEtLimit, mEtSampleTime; 93 private EditText mEtLimit, mEtSampleTime;
94 + private RelativeLayout mRlMainScroll;
93 95
94 96
95 // =========================================================== 97 // ===========================================================
...@@ -105,6 +107,7 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -105,6 +107,7 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
105 mIvBack = findViewById(R.id.iv_telematics_close); 107 mIvBack = findViewById(R.id.iv_telematics_close);
106 mLlTripButton = findViewById(R.id.ll_activate_button); 108 mLlTripButton = findViewById(R.id.ll_activate_button);
107 mLlTripButton.setOnClickListener(this); 109 mLlTripButton.setOnClickListener(this);
110 + mLlTripButton.setOnTouchListener(mTripTouchListener);
108 mTvTripButton = findViewById(R.id.tv_trip_button); 111 mTvTripButton = findViewById(R.id.tv_trip_button);
109 mLlTelematicsMain = findViewById(R.id.ll_telematics_main); 112 mLlTelematicsMain = findViewById(R.id.ll_telematics_main);
110 mTvSensorData = findViewById(R.id.tv_sensor_data); 113 mTvSensorData = findViewById(R.id.tv_sensor_data);
...@@ -116,6 +119,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -116,6 +119,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
116 mTvTouchCount = findViewById(R.id.tv_touch); 119 mTvTouchCount = findViewById(R.id.tv_touch);
117 mEtLimit = findViewById(R.id.et_acceleration); 120 mEtLimit = findViewById(R.id.et_acceleration);
118 mEtSampleTime = findViewById(R.id.et_save); 121 mEtSampleTime = findViewById(R.id.et_save);
122 + mRlMainScroll = findViewById(R.id.rl_main_scroll);
123 + mRlMainScroll.setOnTouchListener(mScrollTouchListener);
119 124
120 locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); 125 locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
121 previousLocation = null; 126 previousLocation = null;
...@@ -200,6 +205,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -200,6 +205,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
200 } 205 }
201 if (view.getId() == R.id.ll_activate_button) { 206 if (view.getId() == R.id.ll_activate_button) {
202 if (mIsTripStarted) { 207 if (mIsTripStarted) {
208 + mEtLimit.setEnabled(true);
209 + mEtSampleTime.setEnabled(true);
203 unregisterSensor(); 210 unregisterSensor();
204 stopLocationUpdates(); 211 stopLocationUpdates();
205 initViews(); 212 initViews();
...@@ -210,6 +217,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -210,6 +217,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
210 Snackbar.make(mLlTelematicsMain, "Please fill the Cut off field", Snackbar.LENGTH_SHORT).show(); 217 Snackbar.make(mLlTelematicsMain, "Please fill the Cut off field", Snackbar.LENGTH_SHORT).show();
211 return; 218 return;
212 } 219 }
220 + mEtLimit.setEnabled(false);
221 + mEtSampleTime.setEnabled(false);
213 mTouchHandler = new Handler(); 222 mTouchHandler = new Handler();
214 mTouchRunnable = new Runnable() { 223 mTouchRunnable = new Runnable() {
215 @Override 224 @Override
...@@ -292,28 +301,45 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -292,28 +301,45 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
292 } 301 }
293 } 302 }
294 303
295 - @Override 304 +// @Override
296 - public boolean onTouchEvent(MotionEvent event) { 305 +// public boolean dispatchTouchEvent(MotionEvent event) {
297 -// return super.onTouchEvent(event); 306 +// if (mIsTripStarted) {
298 - if (mIsTripStarted) { 307 +// switch (event.getAction()) {
299 -// touchCount++; 308 +// case MotionEvent.ACTION_DOWN:
300 -// mTvTouchCount.setText(String.valueOf(touchCount)); 309 +// touchCount++;
301 -// return true; 310 +// mTvTouchCount.setText(String.valueOf(touchCount));
302 - 311 +// mTouchHandler.post(mTouchRunnable);
303 - switch (event.getAction()) { 312 +// return true;
304 - case MotionEvent.ACTION_DOWN: 313 +// case MotionEvent.ACTION_UP:
305 - touchCount++; 314 +// mTouchHandler.removeCallbacks(mTouchRunnable);
306 - mTvTouchCount.setText(String.valueOf(touchCount)); 315 +// return true;
307 - mTouchHandler.post(mTouchRunnable); 316 +// }
308 - return true; 317 +// }
309 - case MotionEvent.ACTION_UP: 318 +// return super.dispatchTouchEvent(event);
310 - mTouchHandler.removeCallbacks(mTouchRunnable); 319 +// }
311 - return true; 320 +
312 - } 321 +// @Override
313 - return false; 322 +// public boolean onTouchEvent(MotionEvent event) {
314 - } 323 +//// return super.onTouchEvent(event);
315 - return false; 324 +// if (mIsTripStarted) {
316 - } 325 +//// touchCount++;
326 +//// mTvTouchCount.setText(String.valueOf(touchCount));
327 +//// return true;
328 +//
329 +// switch (event.getAction()) {
330 +// case MotionEvent.ACTION_DOWN:
331 +// touchCount++;
332 +// mTvTouchCount.setText(String.valueOf(touchCount));
333 +// mTouchHandler.post(mTouchRunnable);
334 +// return true;
335 +// case MotionEvent.ACTION_UP:
336 +// mTouchHandler.removeCallbacks(mTouchRunnable);
337 +// return true;
338 +// }
339 +// return false;
340 +// }
341 +// return false;
342 +// }
317 343
318 // =========================================================== 344 // ===========================================================
319 // Methods 345 // Methods
...@@ -495,6 +521,39 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -495,6 +521,39 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
495 } 521 }
496 } 522 }
497 523
524 + private final View.OnTouchListener mTripTouchListener = new View.OnTouchListener() {
525 + @Override
526 + public boolean onTouch(View view, MotionEvent motionEvent) {
527 + if (mIsTripStarted) {
528 + if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
529 + mTouchHandler.removeCallbacks(mTouchRunnable);
530 + onClick(view);
531 + return true;
532 + }
533 + }
534 + return false;
535 + }
536 + };
537 +
538 + private final View.OnTouchListener mScrollTouchListener = new View.OnTouchListener() {
539 + @Override
540 + public boolean onTouch(View view, MotionEvent motionEvent) {
541 + if (mIsTripStarted) {
542 + switch (motionEvent.getAction()) {
543 + case MotionEvent.ACTION_DOWN:
544 + touchCount++;
545 + mTvTouchCount.setText(String.valueOf(touchCount));
546 + mTouchHandler.post(mTouchRunnable);
547 + return true;
548 + case MotionEvent.ACTION_UP:
549 + mTouchHandler.removeCallbacks(mTouchRunnable);
550 + return true;
551 + }
552 + }
553 + return false;
554 + }
555 + };
556 +
498 // // Low-pass filter function using Exponential Moving Average (EMA) 557 // // Low-pass filter function using Exponential Moving Average (EMA)
499 // private float lowPassFilter(float currentValue) { 558 // private float lowPassFilter(float currentValue) {
500 // float filteredValue = alpha * currentValue + (1 - alpha) * previousFilteredValue; 559 // float filteredValue = alpha * currentValue + (1 - alpha) * previousFilteredValue;
......
...@@ -43,6 +43,7 @@ import android.net.http.SslError; ...@@ -43,6 +43,7 @@ import android.net.http.SslError;
43 import android.os.Build; 43 import android.os.Build;
44 import android.text.TextUtils; 44 import android.text.TextUtils;
45 import android.util.AttributeSet; 45 import android.util.AttributeSet;
46 +import android.util.Log;
46 import android.webkit.GeolocationPermissions.Callback; 47 import android.webkit.GeolocationPermissions.Callback;
47 import android.webkit.JavascriptInterface; 48 import android.webkit.JavascriptInterface;
48 import android.webkit.SslErrorHandler; 49 import android.webkit.SslErrorHandler;
...@@ -75,6 +76,7 @@ import org.json.JSONException; ...@@ -75,6 +76,7 @@ import org.json.JSONException;
75 import org.json.JSONObject; 76 import org.json.JSONObject;
76 77
77 import java.io.UnsupportedEncodingException; 78 import java.io.UnsupportedEncodingException;
79 +import java.net.URISyntaxException;
78 import java.net.URLDecoder; 80 import java.net.URLDecoder;
79 import java.util.HashMap; 81 import java.util.HashMap;
80 import java.util.LinkedHashMap; 82 import java.util.LinkedHashMap;
...@@ -107,6 +109,7 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { ...@@ -107,6 +109,7 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
107 private static final String URL_ACTION_RSMS = "rsms"; 109 private static final String URL_ACTION_RSMS = "rsms";
108 private static final String URL_ACTION_MAIL = "mailto"; 110 private static final String URL_ACTION_MAIL = "mailto";
109 private static final String URL_ACTION_MARKET = "market"; 111 private static final String URL_ACTION_MARKET = "market";
112 + private static final String URL_ACTION_INTENT = "intent";
110 private static final String URL_ACTION_MARKET_AUTHORITY = "play.google.com"; 113 private static final String URL_ACTION_MARKET_AUTHORITY = "play.google.com";
111 private static final String TAG_STEPS_WORKER = "ly.warp.sdk.services.WarplyHealthService"; 114 private static final String TAG_STEPS_WORKER = "ly.warp.sdk.services.WarplyHealthService";
112 115
...@@ -789,6 +792,21 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { ...@@ -789,6 +792,21 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
789 Intent intent = new Intent(Intent.ACTION_VIEW, webpage); 792 Intent intent = new Intent(Intent.ACTION_VIEW, webpage);
790 getContext().startActivity(intent); 793 getContext().startActivity(intent);
791 return true; 794 return true;
795 + } else if (scheme.equalsIgnoreCase(URL_ACTION_INTENT)) {
796 + try {
797 + Intent intent = Intent.parseUri(strUrl, Intent.URI_INTENT_SCHEME);
798 +// String fallbackUrl = intent.getStringExtra("browser_fallback_url");
799 + String data = intent.getData().toString();
800 + if (!TextUtils.isEmpty(data)) {
801 +// view.loadUrl(fallbackUrl);
802 + Uri webpage = Uri.parse(data);
803 + Intent intentWebpage = new Intent(Intent.ACTION_VIEW, webpage);
804 + getContext().startActivity(intentWebpage);
805 + return true;
806 + }
807 + } catch (URISyntaxException e) {
808 + return true;
809 + }
792 } 810 }
793 return false; 811 return false;
794 } 812 }
......
...@@ -40,187 +40,194 @@ ...@@ -40,187 +40,194 @@
40 </androidx.constraintlayout.widget.ConstraintLayout> 40 </androidx.constraintlayout.widget.ConstraintLayout>
41 41
42 <ScrollView 42 <ScrollView
43 - android:fillViewport="true"
44 android:layout_width="wrap_content" 43 android:layout_width="wrap_content"
45 android:layout_height="match_parent"> 44 android:layout_height="match_parent">
46 45
47 - <RelativeLayout 46 + <LinearLayout
48 android:layout_width="match_parent" 47 android:layout_width="match_parent"
49 - android:layout_height="match_parent" 48 + android:layout_height="wrap_content"
50 android:background="@color/cos_light_grey3" 49 android:background="@color/cos_light_grey3"
51 - android:gravity="center_horizontal"> 50 + android:orientation="vertical">
52 - 51 +
53 - <TextView 52 + <RelativeLayout
54 - android:id="@+id/tv_sensor_data_label" 53 + android:id="@+id/rl_main_scroll"
55 - fontPath="fonts/PeridotPE-Regular.ttf" 54 + android:layout_width="match_parent"
56 - android:layout_width="wrap_content" 55 + android:layout_height="match_parent"
57 - android:layout_height="wrap_content" 56 + android:background="@color/cos_light_grey3"
58 - android:layout_centerHorizontal="true" 57 + android:gravity="center_horizontal">
59 - android:layout_marginTop="24dp" 58 +
60 - android:text="Sensor Data" 59 + <TextView
61 - android:textColor="@color/blue_dark" 60 + android:id="@+id/tv_sensor_data_label"
62 - android:textSize="16sp" /> 61 + fontPath="fonts/PeridotPE-Regular.ttf"
63 - 62 + android:layout_width="wrap_content"
64 - <TextView 63 + android:layout_height="wrap_content"
65 - android:id="@+id/tv_sensor_data" 64 + android:layout_centerHorizontal="true"
66 - fontPath="fonts/PeridotPE-Bold.ttf" 65 + android:layout_marginTop="24dp"
67 - android:layout_width="wrap_content" 66 + android:text="Sensor Data"
68 - android:layout_height="wrap_content" 67 + android:textColor="@color/blue_dark"
69 - android:layout_below="@+id/tv_sensor_data_label" 68 + android:textSize="16sp" />
70 - android:layout_centerHorizontal="true" 69 +
71 - android:layout_marginTop="24dp" 70 + <TextView
72 - android:textColor="@color/blue_dark" 71 + android:id="@+id/tv_sensor_data"
73 - android:textSize="16sp" /> 72 + fontPath="fonts/PeridotPE-Bold.ttf"
74 - 73 + android:layout_width="wrap_content"
75 - <TextView 74 + android:layout_height="wrap_content"
76 - android:id="@+id/tv_velocity_label" 75 + android:layout_below="@+id/tv_sensor_data_label"
77 - fontPath="fonts/PeridotPE-Regular.ttf" 76 + android:layout_centerHorizontal="true"
78 - android:layout_width="wrap_content" 77 + android:layout_marginTop="24dp"
79 - android:layout_height="wrap_content" 78 + android:textColor="@color/blue_dark"
80 - android:layout_below="@+id/tv_sensor_data" 79 + android:textSize="16sp" />
81 - android:layout_centerHorizontal="true" 80 +
82 - android:layout_marginTop="24dp" 81 + <TextView
83 - android:text="Acceleration" 82 + android:id="@+id/tv_velocity_label"
84 - android:textColor="@color/blue_dark" 83 + fontPath="fonts/PeridotPE-Regular.ttf"
85 - android:textSize="16sp" /> 84 + android:layout_width="wrap_content"
86 - 85 + android:layout_height="wrap_content"
87 - <TextView 86 + android:layout_below="@+id/tv_sensor_data"
88 - android:id="@+id/tv_velocity" 87 + android:layout_centerHorizontal="true"
89 - fontPath="fonts/PeridotPE-Bold.ttf" 88 + android:layout_marginTop="24dp"
90 - android:layout_width="wrap_content" 89 + android:text="Acceleration"
91 - android:layout_height="wrap_content" 90 + android:textColor="@color/blue_dark"
92 - android:layout_below="@+id/tv_velocity_label" 91 + android:textSize="16sp" />
93 - android:layout_centerHorizontal="true" 92 +
94 - android:layout_marginTop="24dp" 93 + <TextView
95 - android:textColor="@color/blue_dark" 94 + android:id="@+id/tv_velocity"
96 - android:textSize="20sp" /> 95 + fontPath="fonts/PeridotPE-Bold.ttf"
97 - 96 + android:layout_width="wrap_content"
98 - <TextView 97 + android:layout_height="wrap_content"
99 - android:id="@+id/tv_avg_label" 98 + android:layout_below="@+id/tv_velocity_label"
100 - fontPath="fonts/PeridotPE-Regular.ttf" 99 + android:layout_centerHorizontal="true"
101 - android:layout_width="wrap_content" 100 + android:layout_marginTop="24dp"
102 - android:layout_height="wrap_content" 101 + android:textColor="@color/blue_dark"
103 - android:layout_below="@+id/tv_velocity" 102 + android:textSize="20sp" />
104 - android:layout_centerHorizontal="true" 103 +
105 - android:layout_marginTop="24dp" 104 + <TextView
106 - android:text="Velocity" 105 + android:id="@+id/tv_avg_label"
107 - android:textColor="@color/blue_dark" 106 + fontPath="fonts/PeridotPE-Regular.ttf"
108 - android:textSize="16sp" /> 107 + android:layout_width="wrap_content"
109 - 108 + android:layout_height="wrap_content"
110 - <TextView 109 + android:layout_below="@+id/tv_velocity"
111 - android:id="@+id/tv_avg" 110 + android:layout_centerHorizontal="true"
112 - fontPath="fonts/PeridotPE-Bold.ttf" 111 + android:layout_marginTop="24dp"
113 - android:layout_width="wrap_content" 112 + android:text="Velocity"
114 - android:layout_height="wrap_content" 113 + android:textColor="@color/blue_dark"
115 - android:layout_below="@+id/tv_avg_label" 114 + android:textSize="16sp" />
116 - android:layout_centerHorizontal="true" 115 +
117 - android:layout_marginTop="24dp" 116 + <TextView
118 - android:textColor="@color/blue_dark" 117 + android:id="@+id/tv_avg"
119 - android:textSize="20sp" /> 118 + fontPath="fonts/PeridotPE-Bold.ttf"
120 - 119 + android:layout_width="wrap_content"
121 - <TextView 120 + android:layout_height="wrap_content"
122 - android:id="@+id/tv_orientation_label" 121 + android:layout_below="@+id/tv_avg_label"
123 - fontPath="fonts/PeridotPE-Regular.ttf" 122 + android:layout_centerHorizontal="true"
124 - android:layout_width="wrap_content" 123 + android:layout_marginTop="24dp"
125 - android:layout_height="wrap_content" 124 + android:textColor="@color/blue_dark"
126 - android:layout_below="@+id/tv_avg" 125 + android:textSize="20sp" />
127 - android:layout_alignParentStart="true" 126 +
128 - android:layout_marginStart="24dp" 127 + <TextView
129 - android:layout_marginTop="24dp" 128 + android:id="@+id/tv_orientation_label"
130 - android:text="Orientation Count" 129 + fontPath="fonts/PeridotPE-Regular.ttf"
131 - android:textColor="@color/blue_dark" 130 + android:layout_width="wrap_content"
132 - android:textSize="16sp" /> 131 + android:layout_height="wrap_content"
133 - 132 + android:layout_below="@+id/tv_avg"
134 - <TextView 133 + android:layout_alignParentStart="true"
135 - android:id="@+id/tv_orientation" 134 + android:layout_marginStart="24dp"
136 - fontPath="fonts/PeridotPE-Bold.ttf" 135 + android:layout_marginTop="24dp"
137 - android:layout_width="wrap_content" 136 + android:text="Orientation Count"
138 - android:layout_height="wrap_content" 137 + android:textColor="@color/blue_dark"
139 - android:layout_below="@+id/tv_orientation_label" 138 + android:textSize="16sp" />
140 - android:layout_alignStart="@+id/tv_orientation_label" 139 +
141 - android:layout_alignEnd="@+id/tv_orientation_label" 140 + <TextView
142 - android:layout_marginTop="24dp" 141 + android:id="@+id/tv_orientation"
143 - android:gravity="center" 142 + fontPath="fonts/PeridotPE-Bold.ttf"
144 - android:textColor="@color/blue_dark" 143 + android:layout_width="wrap_content"
145 - android:textSize="16sp" /> 144 + android:layout_height="wrap_content"
146 - 145 + android:layout_below="@+id/tv_orientation_label"
147 - <TextView 146 + android:layout_alignStart="@+id/tv_orientation_label"
148 - android:id="@+id/tv_touch_label" 147 + android:layout_alignEnd="@+id/tv_orientation_label"
149 - fontPath="fonts/PeridotPE-Regular.ttf" 148 + android:layout_marginTop="24dp"
150 - android:layout_width="wrap_content" 149 + android:gravity="center"
151 - android:layout_height="wrap_content" 150 + android:textColor="@color/blue_dark"
152 - android:layout_below="@+id/tv_avg" 151 + android:textSize="16sp" />
153 - android:layout_alignParentEnd="true" 152 +
154 - android:layout_marginTop="24dp" 153 + <TextView
155 - android:paddingEnd="24dp" 154 + android:id="@+id/tv_touch_label"
156 - android:layout_marginEnd="24dp" 155 + fontPath="fonts/PeridotPE-Regular.ttf"
157 - android:text="Touch Count" 156 + android:layout_width="wrap_content"
158 - android:textColor="@color/blue_dark" 157 + android:layout_height="wrap_content"
159 - android:textSize="16sp" /> 158 + android:layout_below="@+id/tv_avg"
160 - 159 + android:layout_alignParentEnd="true"
161 - <TextView 160 + android:layout_marginTop="24dp"
162 - android:id="@+id/tv_touch" 161 + android:layout_marginEnd="24dp"
163 - fontPath="fonts/PeridotPE-Bold.ttf" 162 + android:paddingEnd="24dp"
164 - android:layout_width="wrap_content" 163 + android:text="Touch Count"
165 - android:layout_height="wrap_content" 164 + android:textColor="@color/blue_dark"
166 - android:layout_below="@+id/tv_touch_label" 165 + android:textSize="16sp" />
167 - android:layout_alignStart="@+id/tv_touch_label" 166 +
168 - android:layout_alignEnd="@+id/tv_touch_label" 167 + <TextView
169 - android:layout_marginTop="24dp" 168 + android:id="@+id/tv_touch"
170 - android:gravity="center" 169 + fontPath="fonts/PeridotPE-Bold.ttf"
171 - android:textColor="@color/blue_dark" 170 + android:layout_width="wrap_content"
172 - android:textSize="16sp" /> 171 + android:layout_height="wrap_content"
173 - 172 + android:layout_below="@+id/tv_touch_label"
174 - <TextView 173 + android:layout_alignStart="@+id/tv_touch_label"
175 - android:id="@+id/tv_records_label" 174 + android:layout_alignEnd="@+id/tv_touch_label"
176 - fontPath="fonts/PeridotPE-Regular.ttf" 175 + android:layout_marginTop="24dp"
177 - android:layout_width="wrap_content" 176 + android:gravity="center"
178 - android:layout_height="wrap_content" 177 + android:textColor="@color/blue_dark"
179 - android:layout_below="@+id/tv_orientation" 178 + android:textSize="16sp" />
180 - android:layout_centerHorizontal="true" 179 +
181 - android:layout_marginTop="24dp" 180 + <TextView
182 - android:text="Records Saved" 181 + android:id="@+id/tv_records_label"
183 - android:textColor="@color/blue_dark" 182 + fontPath="fonts/PeridotPE-Regular.ttf"
184 - android:textSize="16sp" /> 183 + android:layout_width="wrap_content"
185 - 184 + android:layout_height="wrap_content"
186 - <TextView 185 + android:layout_below="@+id/tv_orientation"
187 - android:id="@+id/tv_records" 186 + android:layout_centerHorizontal="true"
188 - fontPath="fonts/PeridotPE-Bold.ttf" 187 + android:layout_marginTop="24dp"
189 - android:layout_width="wrap_content" 188 + android:text="Records Saved"
190 - android:layout_height="wrap_content" 189 + android:textColor="@color/blue_dark"
191 - android:layout_below="@+id/tv_records_label" 190 + android:textSize="16sp" />
192 - android:layout_centerHorizontal="true" 191 +
193 - android:layout_marginTop="24dp" 192 + <TextView
194 - android:textColor="@color/blue_dark" 193 + android:id="@+id/tv_records"
195 - android:textSize="16sp" /> 194 + fontPath="fonts/PeridotPE-Bold.ttf"
196 - 195 + android:layout_width="wrap_content"
197 - <EditText 196 + android:layout_height="wrap_content"
198 - android:id="@+id/et_acceleration" 197 + android:layout_below="@+id/tv_records_label"
199 - fontPath="fonts/PeridotPE-Bold.ttf" 198 + android:layout_centerHorizontal="true"
200 - android:layout_width="wrap_content" 199 + android:layout_marginTop="24dp"
201 - android:layout_height="wrap_content" 200 + android:textColor="@color/blue_dark"
202 - android:layout_below="@+id/tv_records" 201 + android:textSize="16sp" />
203 - android:layout_alignParentStart="true" 202 +
204 - android:layout_marginTop="24dp" 203 + <EditText
205 - android:layout_marginStart="24dp" 204 + android:id="@+id/et_acceleration"
206 - android:hint="Cut off in m/s^2" 205 + fontPath="fonts/PeridotPE-Bold.ttf"
207 - android:inputType="phone" 206 + android:layout_width="wrap_content"
208 - android:textColor="@color/blue_dark" 207 + android:layout_height="wrap_content"
209 - android:textSize="16sp" /> 208 + android:layout_below="@+id/tv_records"
210 - 209 + android:layout_alignParentStart="true"
211 - <EditText 210 + android:layout_marginStart="24dp"
212 - android:id="@+id/et_save" 211 + android:layout_marginTop="24dp"
213 - fontPath="fonts/PeridotPE-Bold.ttf" 212 + android:hint="Cut off in m/s^2"
214 - android:layout_width="wrap_content" 213 + android:inputType="phone"
215 - android:layout_height="wrap_content" 214 + android:textColor="@color/blue_dark"
216 - android:layout_below="@+id/tv_records" 215 + android:textSize="16sp" />
217 - android:layout_alignParentEnd="true" 216 +
218 - android:paddingEnd="24dp" 217 + <EditText
219 - android:layout_marginTop="24dp" 218 + android:id="@+id/et_save"
220 - android:hint="Sample Interval in ms" 219 + fontPath="fonts/PeridotPE-Bold.ttf"
221 - android:inputType="phone" 220 + android:layout_width="wrap_content"
222 - android:textColor="@color/blue_dark" 221 + android:layout_height="wrap_content"
223 - android:textSize="16sp" /> 222 + android:layout_below="@+id/tv_records"
223 + android:layout_alignParentEnd="true"
224 + android:layout_marginTop="24dp"
225 + android:hint="Sample Interval in ms"
226 + android:inputType="phone"
227 + android:paddingEnd="24dp"
228 + android:textColor="@color/blue_dark"
229 + android:textSize="16sp" />
230 + </RelativeLayout>
224 231
225 <LinearLayout 232 <LinearLayout
226 android:id="@+id/ll_activate_button" 233 android:id="@+id/ll_activate_button"
...@@ -244,6 +251,6 @@ ...@@ -244,6 +251,6 @@
244 android:textColor="@color/blue_dark" 251 android:textColor="@color/blue_dark"
245 android:textSize="16sp" /> 252 android:textSize="16sp" />
246 </LinearLayout> 253 </LinearLayout>
247 - </RelativeLayout> 254 + </LinearLayout>
248 </ScrollView> 255 </ScrollView>
249 </LinearLayout> 256 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......