• R/O
  • HTTP
  • SSH
  • HTTPS

JoggingTimer: Commit

A jogging timer for Android wear.


Commit MetaInfo

Revisiond395519a8cc934b6d90d44bea85a7956f91d1ff4 (tree)
Time2018-07-26 23:58:31
AuthorMRSa <mrsa@myad...>
CommiterMRSa

Log Message

LAPボタンのチャタリング防止をハードボタンでも適用するようにした。
roundのスクロールバー表示を調整。

Change Summary

Incremental Difference

--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
77 jcenter()
88 }
99 dependencies {
10- classpath 'com.android.tools.build:gradle:3.1.2'
10+ classpath 'com.android.tools.build:gradle:3.1.3'
1111
1212
1313 // NOTE: Do not place your application dependencies here; they belong
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
22
33 android {
44 compileSdkVersion 27
5- buildToolsVersion "27.0.3"
5+ buildToolsVersion "28.0.0"
66 defaultConfig {
77 applicationId "net.osdn.gokigen.joggingtimer"
88 minSdkVersion 14 // 14
99 targetSdkVersion 27
10- versionCode 100022
11- versionName "1.0.2"
10+ versionCode 100032
11+ versionName "1.0.3"
1212 }
1313 buildTypes {
1414 release {
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
22
33 android {
44 compileSdkVersion 27
5- buildToolsVersion "27.0.3"
5+ buildToolsVersion "28.0.0"
66 defaultConfig {
77 applicationId "net.osdn.gokigen.joggingtimer"
88 minSdkVersion 23
99 targetSdkVersion 27
10- versionCode 100021
11- versionName "1.0.2"
10+ versionCode 100031
11+ versionName "1.0.3"
1212 }
1313 buildTypes {
1414 release {
@@ -21,7 +21,7 @@ android {
2121 dependencies {
2222 implementation fileTree(dir: 'libs', include: ['*.jar'])
2323 implementation 'com.google.android.support:wearable:2.3.0'
24- implementation 'com.google.android.gms:play-services-wearable:15.0.0'
24+ implementation 'com.google.android.gms:play-services-wearable:15.0.1'
2525 implementation 'com.android.support:percent:27.1.1'
2626 implementation 'com.android.support:support-v4:27.1.1'
2727 implementation 'com.android.support:recyclerview-v7:27.1.1'
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java
@@ -55,8 +55,8 @@ public class ListActivity extends WearableActivity implements IDetailLauncher, R
5555 summaryAdapter = new RecordSummaryAdapter();
5656 WearableLinearLayoutManager layoutManager = new WearableLinearLayoutManager(this);
5757
58- //view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound());
59- view.setCircularScrollingGestureEnabled(false);
58+ view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound());
59+ //view.setCircularScrollingGestureEnabled(false);
6060
6161 DividerItemDecoration dividerDecoration = new DividerItemDecoration(view.getContext(), layoutManager.getOrientation());
6262
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
@@ -303,7 +303,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
303303 {
304304 Log.v(TAG, "startTimer() LAP TIME");
305305 long currentElapsedTime = timerCounter.getCurrentElapsedTime();
306- // if (currentElapsedTime > 3000) // チャタリング防止(ラップタイムとして、3秒以内は記録しないようにする)
306+ if (currentElapsedTime > 3000) // チャタリング防止(ラップタイムとして、3秒以内は記録しないようにする)
307307 {
308308 currentLapCount++;
309309 long lapTime = timerCounter.timeStamp();
Show on old repository browser