rename to sprot

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644 (file)
index 0000000..c83a369
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="MarkdownUnresolvedFileReference" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 9cff432..f62ff1f 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 static def getL02ApkBaseName() {
-    return "ICL02Hardware"
+    return "ICL02Sport"
 }
 
 android {
@@ -12,7 +12,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
     defaultConfig {
-        applicationId "com.ic.hardware"
+        applicationId "com.ic.sport"
         minSdkVersion 19
         targetSdkVersion 29
         versionCode currentVersionCode

diff --git a/app/src/androidTest/java/com/ic/hardware/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/ic/sport/ExampleInstrumentedTest.java
similarity index 87%
rename from app/src/androidTest/java/com/ic/hardware/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/ic/sport/ExampleInstrumentedTest.java
index ce894eb..2739c2b 100644 (file)
--- a/app/src/androidTest/java/com/ic/hardware/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/ic/sport/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.ic.hardware;
+package com.ic.sport;
 
 import android.content.Context;
 
@@ -22,6 +22,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.ic.hardware", appContext.getPackageName());
+        assertEquals("com.ic.sport", appContext.getPackageName());
     }
 }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c3a75a..a5b7ebd 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ic.hardware">
+    package="com.ic.sport">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
-        android:name=".HardwareApp"
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -17,7 +17,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <activity android:name=".PedometerActivity">
+        <activity android:name="com.ic.sport.PedometerActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

diff --git a/app/src/main/aidl/com/ic/aidl/ped/IPedAidlInterface.aidl b/app/src/main/aidl/com/ic/aidl/ped/IPedAidlInterface.aidl
index b9615f6..339498a 100644 (file)
--- a/app/src/main/aidl/com/ic/aidl/ped/IPedAidlInterface.aidl
+++ b/app/src/main/aidl/com/ic/aidl/ped/IPedAidlInterface.aidl
@@ -1,14 +1,9 @@
-// IWeatherAidlInterface.aidl
 package com.ic.aidl.ped;
 
-// Declare any non-default types here with import statements
 import com.ic.aidl.ped.RecordParcelable;
 
 interface IPedAidlInterface {
-    /**
-     * Demonstrates some basic types that you can use as parameters
-     * and return values in AIDL.
-     */
+
      void updatePedCount(int count);
      void updatePedRecord(in List<RecordParcelable> record);
 

diff --git a/app/src/main/java/com/ic/hardware/HardwareApp.java b/app/src/main/java/com/ic/sport/App.java
similarity index 62%
rename from app/src/main/java/com/ic/hardware/HardwareApp.java
rename to app/src/main/java/com/ic/sport/App.java
index 34e303f..b0f4b64 100644 (file)
--- a/app/src/main/java/com/ic/hardware/HardwareApp.java
+++ b/app/src/main/java/com/ic/sport/App.java
@@ -1,17 +1,17 @@
-package com.ic.hardware;
+package com.ic.sport;
 
 import android.app.Application;
 
-import com.ic.hardware.util.CrashHandler;
-import com.ic.hardware.util.IcLog;
+import com.ic.sport.util.CrashHandler;
+import com.ic.sport.util.IcLog;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 
-public class HardwareApp extends Application {
+public class App extends Application {
 
     @Override
     public void onCreate() {
         super.onCreate();
-        IcLog.setLogHead("IcHardware");
+        IcLog.setLogHead("ICSport");
 
         AndroidThreeTen.init(this);
 

diff --git a/app/src/main/java/com/ic/hardware/MainClockGestureDetectorImpl.java b/app/src/main/java/com/ic/sport/MainClockGestureDetectorImpl.java
similarity index 94%
rename from app/src/main/java/com/ic/hardware/MainClockGestureDetectorImpl.java
rename to app/src/main/java/com/ic/sport/MainClockGestureDetectorImpl.java
index 8ffa181..c6d3be2 100644 (file)
--- a/app/src/main/java/com/ic/hardware/MainClockGestureDetectorImpl.java
+++ b/app/src/main/java/com/ic/sport/MainClockGestureDetectorImpl.java
@@ -1,9 +1,9 @@
-package com.ic.hardware;
+package com.ic.sport;
 
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 
-import com.ic.hardware.util.IcLog;
+import com.ic.sport.util.IcLog;
 
 
 public class MainClockGestureDetectorImpl extends GestureDetector.SimpleOnGestureListener {

diff --git a/app/src/main/java/com/ic/hardware/PedometerActivity.java b/app/src/main/java/com/ic/sport/PedometerActivity.java
similarity index 87%
rename from app/src/main/java/com/ic/hardware/PedometerActivity.java
rename to app/src/main/java/com/ic/sport/PedometerActivity.java
index acf86ca..fd3a809 100644 (file)
--- a/app/src/main/java/com/ic/hardware/PedometerActivity.java
+++ b/app/src/main/java/com/ic/sport/PedometerActivity.java
@@ -1,7 +1,6 @@
-package com.ic.hardware;
+package com.ic.sport;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -9,15 +8,15 @@ import androidx.viewpager2.widget.ViewPager2;
 
 import android.os.Bundle;
 
-import com.ic.hardware.adapter.FragmentAdapter;
-import com.ic.hardware.adapter.IndicatorAdapter;
-import com.ic.hardware.fragment.pedometer.PedMainFragment;
-import com.ic.hardware.fragment.pedometer.PedRecordFragment;
-import com.ic.hardware.fragment.pedometer.PedSetupDialogFragment;
-import com.ic.hardware.fragment.pedometer.PedSetupFragment;
-import com.ic.hardware.model.PedometerModel;
-import com.ic.hardware.util.IcLog;
-import com.ic.hardware.util.SPUtils;
+import com.ic.sport.adapter.FragmentAdapter;
+import com.ic.sport.adapter.IndicatorAdapter;
+import com.ic.sport.fragment.pedometer.PedMainFragment;
+import com.ic.sport.fragment.pedometer.PedRecordFragment;
+import com.ic.sport.fragment.pedometer.PedSetupDialogFragment;
+import com.ic.sport.fragment.pedometer.PedSetupFragment;
+import com.ic.sport.model.PedometerModel;
+import com.ic.sport.util.IcLog;
+import com.ic.sport.util.SPUtils;
 
 import static androidx.viewpager2.widget.ViewPager2.SCROLL_STATE_IDLE;
 

diff --git a/app/src/main/java/com/ic/hardware/adapter/FragmentAdapter.java b/app/src/main/java/com/ic/sport/adapter/FragmentAdapter.java
similarity index 82%
rename from app/src/main/java/com/ic/hardware/adapter/FragmentAdapter.java
rename to app/src/main/java/com/ic/sport/adapter/FragmentAdapter.java
index a6e20c6..b2f5d52 100644 (file)
--- a/app/src/main/java/com/ic/hardware/adapter/FragmentAdapter.java
+++ b/app/src/main/java/com/ic/sport/adapter/FragmentAdapter.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.adapter;
+package com.ic.sport.adapter;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
@@ -6,9 +6,9 @@ import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Lifecycle;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import com.ic.hardware.fragment.pedometer.PedMainFragment;
-import com.ic.hardware.fragment.pedometer.PedRecordFragment;
-import com.ic.hardware.fragment.pedometer.PedSetupFragment;
+import com.ic.sport.fragment.pedometer.PedMainFragment;
+import com.ic.sport.fragment.pedometer.PedRecordFragment;
+import com.ic.sport.fragment.pedometer.PedSetupFragment;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/com/ic/hardware/adapter/IndicatorAdapter.java b/app/src/main/java/com/ic/sport/adapter/IndicatorAdapter.java
similarity index 94%
rename from app/src/main/java/com/ic/hardware/adapter/IndicatorAdapter.java
rename to app/src/main/java/com/ic/sport/adapter/IndicatorAdapter.java
index fcddf59..bd93c33 100644 (file)
--- a/app/src/main/java/com/ic/hardware/adapter/IndicatorAdapter.java
+++ b/app/src/main/java/com/ic/sport/adapter/IndicatorAdapter.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.adapter;
+package com.ic.sport.adapter;
 
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -6,7 +6,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.ic.hardware.databinding.ItemIndicatorLayoutBinding;
+import com.ic.sport.databinding.ItemIndicatorLayoutBinding;
 
 public class IndicatorAdapter extends RecyclerView.Adapter<IndicatorAdapter.IndicatorHolder> {
 

diff --git a/app/src/main/java/com/ic/hardware/adapter/PedRecordAdapter.java b/app/src/main/java/com/ic/sport/adapter/PedRecordAdapter.java
similarity index 95%
rename from app/src/main/java/com/ic/hardware/adapter/PedRecordAdapter.java
rename to app/src/main/java/com/ic/sport/adapter/PedRecordAdapter.java
index 42f40a9..985b879 100644 (file)
--- a/app/src/main/java/com/ic/hardware/adapter/PedRecordAdapter.java
+++ b/app/src/main/java/com/ic/sport/adapter/PedRecordAdapter.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.adapter;
+package com.ic.sport.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -9,8 +9,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.ic.aidl.ped.RecordParcelable;
-import com.ic.hardware.R;
-import com.ic.hardware.databinding.ItemPedRecordBinding;
+import com.ic.sport.R;
+import com.ic.sport.databinding.ItemPedRecordBinding;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/com/ic/hardware/adapter/PedSetupAdapter.java b/app/src/main/java/com/ic/sport/adapter/PedSetupAdapter.java
similarity index 92%
rename from app/src/main/java/com/ic/hardware/adapter/PedSetupAdapter.java
rename to app/src/main/java/com/ic/sport/adapter/PedSetupAdapter.java
index 6aae4b1..e45cc28 100644 (file)
--- a/app/src/main/java/com/ic/hardware/adapter/PedSetupAdapter.java
+++ b/app/src/main/java/com/ic/sport/adapter/PedSetupAdapter.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.adapter;
+package com.ic.sport.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,11 +8,11 @@ import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.ic.hardware.R;
-import com.ic.hardware.databinding.ItemPedSetupBinding;
-import com.ic.hardware.entitys.PedSetupEntity;
-import com.ic.hardware.fragment.pedometer.PedSetupFragment;
-import com.ic.hardware.util.SPUtils;
+import com.ic.sport.R;
+import com.ic.sport.databinding.ItemPedSetupBinding;
+import com.ic.sport.entitys.PedSetupEntity;
+import com.ic.sport.fragment.pedometer.PedSetupFragment;
+import com.ic.sport.util.SPUtils;
 
 
 public class PedSetupAdapter extends RecyclerView.Adapter<PedSetupAdapter.SetUpHolder> {

diff --git a/app/src/main/java/com/ic/hardware/entitys/PedRecordEntity.java b/app/src/main/java/com/ic/sport/entitys/PedRecordEntity.java
similarity index 97%
rename from app/src/main/java/com/ic/hardware/entitys/PedRecordEntity.java
rename to app/src/main/java/com/ic/sport/entitys/PedRecordEntity.java
index 82e3cce..10d90b3 100644 (file)
--- a/app/src/main/java/com/ic/hardware/entitys/PedRecordEntity.java
+++ b/app/src/main/java/com/ic/sport/entitys/PedRecordEntity.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.entitys;
+package com.ic.sport.entitys;
 
 public class PedRecordEntity {
     private String recordDate;

diff --git a/app/src/main/java/com/ic/hardware/entitys/PedSetupEntity.java b/app/src/main/java/com/ic/sport/entitys/PedSetupEntity.java
similarity index 96%
rename from app/src/main/java/com/ic/hardware/entitys/PedSetupEntity.java
rename to app/src/main/java/com/ic/sport/entitys/PedSetupEntity.java
index 1d76163..d674fe8 100644 (file)
--- a/app/src/main/java/com/ic/hardware/entitys/PedSetupEntity.java
+++ b/app/src/main/java/com/ic/sport/entitys/PedSetupEntity.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.entitys;
+package com.ic.sport.entitys;
 
 import android.graphics.drawable.Drawable;
 

diff --git a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedMainFragment.java b/app/src/main/java/com/ic/sport/fragment/pedometer/PedMainFragment.java
similarity index 85%
rename from app/src/main/java/com/ic/hardware/fragment/pedometer/PedMainFragment.java
rename to app/src/main/java/com/ic/sport/fragment/pedometer/PedMainFragment.java
index 53c51d1..18c3c38 100644 (file)
--- a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedMainFragment.java
+++ b/app/src/main/java/com/ic/sport/fragment/pedometer/PedMainFragment.java
@@ -1,15 +1,13 @@
-package com.ic.hardware.fragment.pedometer;
+package com.ic.sport.fragment.pedometer;
 
 
 import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
-import androidx.core.view.GestureDetectorCompat;
 import androidx.fragment.app.Fragment;
 
 import android.view.LayoutInflater;
@@ -17,12 +15,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.ic.hardware.HardwareApp;
-import com.ic.hardware.MainClockGestureDetectorImpl;
-import com.ic.hardware.databinding.FragmentPedMainBinding;
-import com.ic.hardware.util.SPUtils;
-import com.ic.hardware.widget.ring.Ring;
-import com.ic.hardware.widget.ring.RingProgress;
+import com.ic.sport.App;
+import com.ic.sport.databinding.FragmentPedMainBinding;
+import com.ic.sport.util.SPUtils;
+import com.ic.sport.widget.ring.Ring;
+import com.ic.sport.widget.ring.RingProgress;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,7 +34,7 @@ public class PedMainFragment extends Fragment {
     }
 
     private Context mContext;
-    private HardwareApp mApp;
+    private App mApp;
 
     private FragmentPedMainBinding pedMainBinding;
 
@@ -65,7 +62,7 @@ public class PedMainFragment extends Fragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mApp = (HardwareApp) mContext.getApplicationContext();
+        mApp = (App) mContext.getApplicationContext();
     }
 
 

diff --git a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedRecordFragment.java b/app/src/main/java/com/ic/sport/fragment/pedometer/PedRecordFragment.java
similarity index 94%
rename from app/src/main/java/com/ic/hardware/fragment/pedometer/PedRecordFragment.java
rename to app/src/main/java/com/ic/sport/fragment/pedometer/PedRecordFragment.java
index bf3308f..0ee521c 100644 (file)
--- a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedRecordFragment.java
+++ b/app/src/main/java/com/ic/sport/fragment/pedometer/PedRecordFragment.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.fragment.pedometer;
+package com.ic.sport.fragment.pedometer;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -12,8 +12,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.ic.aidl.ped.RecordParcelable;
-import com.ic.hardware.R;
-import com.ic.hardware.adapter.PedRecordAdapter;
+import com.ic.sport.R;
+import com.ic.sport.adapter.PedRecordAdapter;
 
 import java.util.List;
 

diff --git a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedSetupDialogFragment.java b/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupDialogFragment.java
similarity index 91%
rename from app/src/main/java/com/ic/hardware/fragment/pedometer/PedSetupDialogFragment.java
rename to app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupDialogFragment.java
index 1d81205..ea08c99 100644 (file)
--- a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedSetupDialogFragment.java
+++ b/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupDialogFragment.java
@@ -1,12 +1,8 @@
-package com.ic.hardware.fragment.pedometer;
+package com.ic.sport.fragment.pedometer;
 
-import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.Intent;
-import android.icu.text.DisplayContext;
 import android.os.Bundle;
-import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,10 +15,10 @@ import androidx.annotation.Nullable;
 import androidx.collection.ArrayMap;
 import androidx.fragment.app.DialogFragment;
 
-import com.ic.hardware.R;
-import com.ic.hardware.util.SPUtils;
-import com.ic.hardware.widget.picker.NumericWheelAdapter;
-import com.ic.hardware.widget.picker.WheelView;
+import com.ic.sport.R;
+import com.ic.sport.util.SPUtils;
+import com.ic.sport.widget.picker.NumericWheelAdapter;
+import com.ic.sport.widget.picker.WheelView;
 
 public class PedSetupDialogFragment extends DialogFragment {
 

diff --git a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedSetupFragment.java b/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupFragment.java
similarity index 94%
rename from app/src/main/java/com/ic/hardware/fragment/pedometer/PedSetupFragment.java
rename to app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupFragment.java
index 7504e6f..eeff34c 100644 (file)
--- a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedSetupFragment.java
+++ b/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupFragment.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.fragment.pedometer;
+package com.ic.sport.fragment.pedometer;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -13,8 +13,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.ic.hardware.R;
-import com.ic.hardware.adapter.PedSetupAdapter;
+import com.ic.sport.R;
+import com.ic.sport.adapter.PedSetupAdapter;
 
 
 public class PedSetupFragment extends Fragment{

diff --git a/app/src/main/java/com/ic/hardware/model/PedometerModel.java b/app/src/main/java/com/ic/sport/model/PedometerModel.java
similarity index 96%
rename from app/src/main/java/com/ic/hardware/model/PedometerModel.java
rename to app/src/main/java/com/ic/sport/model/PedometerModel.java
index 3f9dcc1..7849443 100644 (file)
--- a/app/src/main/java/com/ic/hardware/model/PedometerModel.java
+++ b/app/src/main/java/com/ic/sport/model/PedometerModel.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.model;
+package com.ic.sport.model;
 
 import android.app.Application;
 
@@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.ic.aidl.ped.RecordParcelable;
-import com.ic.hardware.presenter.PedometerPresenter;
+import com.ic.sport.presenter.PedometerPresenter;
 
 import java.util.List;
 

diff --git a/app/src/main/java/com/ic/hardware/presenter/PedometerPresenter.java b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java
similarity index 95%
rename from app/src/main/java/com/ic/hardware/presenter/PedometerPresenter.java
rename to app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java
index 2cc4be5..f7cc78f 100644 (file)
--- a/app/src/main/java/com/ic/hardware/presenter/PedometerPresenter.java
+++ b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.presenter;
+package com.ic.sport.presenter;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -11,8 +11,8 @@ import androidx.lifecycle.MutableLiveData;
 import com.ic.aidl.ped.IPedAidlInterface;
 import com.ic.aidl.ped.IPedRemoteService;
 import com.ic.aidl.ped.RecordParcelable;
-import com.ic.hardware.util.IcLog;
-import com.ic.hardware.util.ServiceUtil;
+import com.ic.sport.util.IcLog;
+import com.ic.sport.util.ServiceUtil;
 
 import java.util.List;
 
@@ -40,7 +40,8 @@ public class PedometerPresenter {
     }
 
     public void bindService(){
-        ServiceUtil.bindServiceUtil(mContext, "com.ic.action.WORK_SERVICE", connection,mContext.getPackageName(), 103);
+        ServiceUtil.bindServiceUtil(mContext, "com.ic.action.WORK_SERVICE",
+                connection,mContext.getPackageName(), 103);
     }
 
     public void unbindService(){

diff --git a/app/src/main/java/com/ic/hardware/util/CrashHandler.java b/app/src/main/java/com/ic/sport/util/CrashHandler.java
similarity index 96%
rename from app/src/main/java/com/ic/hardware/util/CrashHandler.java
rename to app/src/main/java/com/ic/sport/util/CrashHandler.java
index 3f3822d..1d6aaeb 100644 (file)
--- a/app/src/main/java/com/ic/hardware/util/CrashHandler.java
+++ b/app/src/main/java/com/ic/sport/util/CrashHandler.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.util;
+package com.ic.sport.util;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -10,7 +10,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 
-import com.ic.hardware.R;
+import com.ic.sport.R;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -193,10 +193,10 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
         sb.append("\n\n");
 
         try {
-            String fileName = "IcHardware-" + dateFormatDate.format(new Date()) + ".log";
+            String fileName = "ICSport-" + dateFormatDate.format(new Date()) + ".log";
             if (Environment.getExternalStorageState().equals(
                     Environment.MEDIA_MOUNTED)) {
-                File dir = new File(Environment.getExternalStorageDirectory().getPath(), "Android/ic/crash/IcHardware");
+                File dir = new File(Environment.getExternalStorageDirectory().getPath(), "Android/ic/crash/ICSport");
                 String path = dir.getPath();
                 if (!dir.exists()) {
                     dir.mkdirs();
@@ -207,7 +207,7 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
             }
             return fileName;
         } catch (Exception e) {
-            Log.e(TAG, "an error occured while writing file...," + e);
+            Log.e(TAG, "an error happen while writing file...," + e);
         }
         return null;
     }

diff --git a/app/src/main/java/com/ic/hardware/util/IcLog.java b/app/src/main/java/com/ic/sport/util/IcLog.java
similarity index 94%
rename from app/src/main/java/com/ic/hardware/util/IcLog.java
rename to app/src/main/java/com/ic/sport/util/IcLog.java
index 4caf90a..5ef8933 100644 (file)
--- a/app/src/main/java/com/ic/hardware/util/IcLog.java
+++ b/app/src/main/java/com/ic/sport/util/IcLog.java
@@ -1,9 +1,7 @@
-package com.ic.hardware.util;
+package com.ic.sport.util;
 
 import android.util.Log;
 
-import com.ic.hardware.BuildConfig;
-
 /**
  * @author RyanLee
  * @date 2018/2/2

diff --git a/app/src/main/java/com/ic/hardware/util/SPUtils.java b/app/src/main/java/com/ic/sport/util/SPUtils.java
similarity index 92%
rename from app/src/main/java/com/ic/hardware/util/SPUtils.java
rename to app/src/main/java/com/ic/sport/util/SPUtils.java
index 6d5a7bc..a409d4e 100644 (file)
--- a/app/src/main/java/com/ic/hardware/util/SPUtils.java
+++ b/app/src/main/java/com/ic/sport/util/SPUtils.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.util;
+package com.ic.sport.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -11,7 +11,7 @@ public class SPUtils {
 
 
     private static SharedPreferences getSp(Context context) {
-        return context.getSharedPreferences("IcHardwarePed", Context.MODE_PRIVATE);
+        return context.getSharedPreferences("ICSport", Context.MODE_PRIVATE);
     }
 
     public static int getPedHeightSP(Context context) {

diff --git a/app/src/main/java/com/ic/hardware/util/ServiceUtil.java b/app/src/main/java/com/ic/sport/util/ServiceUtil.java
similarity index 98%
rename from app/src/main/java/com/ic/hardware/util/ServiceUtil.java
rename to app/src/main/java/com/ic/sport/util/ServiceUtil.java
index 03a9389..2bb70a9 100644 (file)
--- a/app/src/main/java/com/ic/hardware/util/ServiceUtil.java
+++ b/app/src/main/java/com/ic/sport/util/ServiceUtil.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.util;
+package com.ic.sport.util;
 
 import android.content.ComponentName;
 import android.content.Context;

diff --git a/app/src/main/java/com/ic/hardware/widget/WidgetImageTextLayout.java b/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
similarity index 94%
rename from app/src/main/java/com/ic/hardware/widget/WidgetImageTextLayout.java
rename to app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
index d1a3a51..d233f25 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/WidgetImageTextLayout.java
+++ b/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
@@ -1,7 +1,6 @@
-package com.ic.hardware.widget;
+package com.ic.sport.widget;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -11,7 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.databinding.BindingAdapter;
 
-import com.ic.hardware.R;
+import com.ic.sport.R;
 
 public class WidgetImageTextLayout extends LinearLayout {
 

diff --git a/app/src/main/java/com/ic/hardware/widget/picker/NumericWheelAdapter.java b/app/src/main/java/com/ic/sport/widget/picker/NumericWheelAdapter.java
similarity index 98%
rename from app/src/main/java/com/ic/hardware/widget/picker/NumericWheelAdapter.java
rename to app/src/main/java/com/ic/sport/widget/picker/NumericWheelAdapter.java
index 3bee5c5..783c75b 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/picker/NumericWheelAdapter.java
+++ b/app/src/main/java/com/ic/sport/widget/picker/NumericWheelAdapter.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.ic.hardware.widget.picker;
+package com.ic.sport.widget.picker;
 
 /**
  * Numeric Wheel adapter.

diff --git a/app/src/main/java/com/ic/hardware/widget/picker/OnWheelChangedListener.java b/app/src/main/java/com/ic/sport/widget/picker/OnWheelChangedListener.java
similarity index 96%
rename from app/src/main/java/com/ic/hardware/widget/picker/OnWheelChangedListener.java
rename to app/src/main/java/com/ic/sport/widget/picker/OnWheelChangedListener.java
index 54aaa58..5cdae27 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/picker/OnWheelChangedListener.java
+++ b/app/src/main/java/com/ic/sport/widget/picker/OnWheelChangedListener.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.ic.hardware.widget.picker;
+package com.ic.sport.widget.picker;
 
 /**
  * Wheel changed listener interface.

diff --git a/app/src/main/java/com/ic/hardware/widget/picker/OnWheelScrollListener.java b/app/src/main/java/com/ic/sport/widget/picker/OnWheelScrollListener.java
similarity index 96%
rename from app/src/main/java/com/ic/hardware/widget/picker/OnWheelScrollListener.java
rename to app/src/main/java/com/ic/sport/widget/picker/OnWheelScrollListener.java
index 56b5299..b958a4d 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/picker/OnWheelScrollListener.java
+++ b/app/src/main/java/com/ic/sport/widget/picker/OnWheelScrollListener.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.ic.hardware.widget.picker;
+package com.ic.sport.widget.picker;
 
 /**
  * Wheel scrolled listener interface.

diff --git a/app/src/main/java/com/ic/hardware/widget/picker/WheelAdapter.java b/app/src/main/java/com/ic/sport/widget/picker/WheelAdapter.java
similarity index 96%
rename from app/src/main/java/com/ic/hardware/widget/picker/WheelAdapter.java
rename to app/src/main/java/com/ic/sport/widget/picker/WheelAdapter.java
index d1e5b7d..36e9004 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/picker/WheelAdapter.java
+++ b/app/src/main/java/com/ic/sport/widget/picker/WheelAdapter.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.ic.hardware.widget.picker;
+package com.ic.sport.widget.picker;
 
 public interface WheelAdapter {
        /**

diff --git a/app/src/main/java/com/ic/hardware/widget/picker/WheelView.java b/app/src/main/java/com/ic/sport/widget/picker/WheelView.java
similarity index 99%
rename from app/src/main/java/com/ic/hardware/widget/picker/WheelView.java
rename to app/src/main/java/com/ic/sport/widget/picker/WheelView.java
index dcd488f..a75eb11 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/picker/WheelView.java
+++ b/app/src/main/java/com/ic/sport/widget/picker/WheelView.java
@@ -17,7 +17,7 @@
  *  limitations under the License.
  */
 
-package com.ic.hardware.widget.picker;
+package com.ic.sport.widget.picker;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -39,7 +39,7 @@ import android.view.View;
 import android.view.animation.Interpolator;
 import android.widget.Scroller;
 
-import com.ic.hardware.R;
+import com.ic.sport.R;
 
 import java.util.LinkedList;
 import java.util.List;

diff --git a/app/src/main/java/com/ic/hardware/widget/ring/OnSelectRing.java b/app/src/main/java/com/ic/sport/widget/ring/OnSelectRing.java
similarity index 62%
rename from app/src/main/java/com/ic/hardware/widget/ring/OnSelectRing.java
rename to app/src/main/java/com/ic/sport/widget/ring/OnSelectRing.java
index eda60ca..f9c662c 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/ring/OnSelectRing.java
+++ b/app/src/main/java/com/ic/sport/widget/ring/OnSelectRing.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.widget.ring;
+package com.ic.sport.widget.ring;
 
 public interface OnSelectRing {
     void Selected(Ring r);

diff --git a/app/src/main/java/com/ic/hardware/widget/ring/Ring.java b/app/src/main/java/com/ic/sport/widget/ring/Ring.java
similarity index 97%
rename from app/src/main/java/com/ic/hardware/widget/ring/Ring.java
rename to app/src/main/java/com/ic/sport/widget/ring/Ring.java
index e510c17..3dadb6f 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/ring/Ring.java
+++ b/app/src/main/java/com/ic/sport/widget/ring/Ring.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.widget.ring;
+package com.ic.sport.widget.ring;
 
 import android.graphics.RectF;
 

diff --git a/app/src/main/java/com/ic/hardware/widget/ring/RingProgress.java b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
similarity index 99%
rename from app/src/main/java/com/ic/hardware/widget/ring/RingProgress.java
rename to app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
index 6c8fa30..7e2aa9d 100644 (file)
--- a/app/src/main/java/com/ic/hardware/widget/ring/RingProgress.java
+++ b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
@@ -1,4 +1,4 @@
-package com.ic.hardware.widget.ring;
+package com.ic.sport.widget.ring;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -19,7 +19,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
 
-import com.ic.hardware.R;
+import com.ic.sport.R;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/res/layout/dialog_ped_setup_layout.xml b/app/src/main/res/layout/dialog_ped_setup_layout.xml
index 471f82c..19cfc56 100644 (file)
--- a/app/src/main/res/layout/dialog_ped_setup_layout.xml
+++ b/app/src/main/res/layout/dialog_ped_setup_layout.xml
@@ -12,7 +12,7 @@
         android:layout_marginTop="10dp"
         android:layout_weight="1">
 
-        <com.ic.hardware.widget.picker.WheelView
+        <com.ic.sport.widget.picker.WheelView
             android:id="@+id/dialog_value_picker"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/fragment_ped_main.xml b/app/src/main/res/layout/fragment_ped_main.xml
index 476d431..4ae33ec 100644 (file)
--- a/app/src/main/res/layout/fragment_ped_main.xml
+++ b/app/src/main/res/layout/fragment_ped_main.xml
@@ -19,7 +19,7 @@
         android:layout_width="match_parent"
         tools:context=".fragment.pedometer.PedMainFragment">
 
-        <com.ic.hardware.widget.ring.RingProgress
+        <com.ic.sport.widget.ring.RingProgress
             android:id="@+id/ring_progress"
             android:layout_height="match_parent"
             android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/item_ped_record.xml b/app/src/main/res/layout/item_ped_record.xml
index d0e1cd9..0c1cda0 100644 (file)
--- a/app/src/main/res/layout/item_ped_record.xml
+++ b/app/src/main/res/layout/item_ped_record.xml
@@ -75,7 +75,7 @@
             android:layout_marginTop="5dp"
             android:text="@{recordDate}" />
 
-        <com.ic.hardware.widget.WidgetImageTextLayout
+        <com.ic.sport.widget.WidgetImageTextLayout
             android:id="@+id/item_record_taking"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
             icApp:widgetImageColor="@{takingColor}"
             icApp:widgetImageValue="@{recordTaking}" />
 
-        <com.ic.hardware.widget.WidgetImageTextLayout
+        <com.ic.sport.widget.WidgetImageTextLayout
             android:id="@+id/item_record_calories"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             android:layout_marginEnd="5dp"/>
 
 
-        <com.ic.hardware.widget.WidgetImageTextLayout
+        <com.ic.sport.widget.WidgetImageTextLayout
             android:id="@+id/item_record_distance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/item_ped_setup.xml b/app/src/main/res/layout/item_ped_setup.xml
index d66053f..7541dde 100644 (file)
--- a/app/src/main/res/layout/item_ped_setup.xml
+++ b/app/src/main/res/layout/item_ped_setup.xml
@@ -25,7 +25,7 @@
 
         <variable
             name="onItemClick"
-            type="com.ic.hardware.fragment.pedometer.PedSetupFragment.OnPedSetupItemClickListener" />
+            type="com.ic.sport.fragment.pedometer.PedSetupFragment.OnPedSetupItemClickListener" />
     </data>
 
     <LinearLayout

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 84e2061..56cf593 100644 (file)
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">IcHardware</string>
+    <string name="app_name">ICSport</string>
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d8e140d..fbfff96 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">IcHardware</string>
+    <string name="app_name">ICSport</string>
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 2b99c5e..8195e2a 100644 (file)
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">IcHardware</string>
+    <string name="app_name">运动</string>
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3e4d8bc..5676129 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">IcHardware</string>
+    <string name="app_name">ICSport</string>
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>

diff --git a/app/src/test/java/com/ic/hardware/ExampleUnitTest.java b/app/src/test/java/com/ic/sport/ExampleUnitTest.java
similarity index 93%
rename from app/src/test/java/com/ic/hardware/ExampleUnitTest.java
rename to app/src/test/java/com/ic/sport/ExampleUnitTest.java
index 7086040..4f56b88 100644 (file)
--- a/app/src/test/java/com/ic/hardware/ExampleUnitTest.java
+++ b/app/src/test/java/com/ic/sport/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.ic.hardware;
+package com.ic.sport;
 
 import org.junit.Test;
 

diff --git a/settings.gradle b/settings.gradle
index 31300e9..989b3b2 100644 (file)
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 include ':app'
-rootProject.name='IcHardware'
+rootProject.name='ICSport'