liuzhenxing1118 5 месяцев назад
Родитель
Сommit
3229e5d0dd
29 измененных файлов с 80 добавлено и 122 удалено
  1. 1 0
      .idea/.name
  2. 1 1
      app/build.gradle
  3. 0 26
      app/src/androidTest/java/com/sikey/skcontact/ExampleInstrumentedTest.java
  4. 2 2
      app/src/main/AndroidManifest.xml
  5. 1 1
      app/src/main/java/com/sikey/skphone/ContactApplication.java
  6. 6 6
      app/src/main/java/com/sikey/skphone/activity/BaseActionActivity.java
  7. 7 7
      app/src/main/java/com/sikey/skphone/activity/BaseActivity.java
  8. 2 2
      app/src/main/java/com/sikey/skphone/activity/BaseInputActivity.java
  9. 6 6
      app/src/main/java/com/sikey/skphone/activity/CallActivity.java
  10. 8 8
      app/src/main/java/com/sikey/skphone/activity/ContactActivity.java
  11. 2 2
      app/src/main/java/com/sikey/skphone/activity/DialActivity.java
  12. 12 12
      app/src/main/java/com/sikey/skphone/activity/RecentActivity.java
  13. 4 4
      app/src/main/java/com/sikey/skphone/adapter/BaseListAdapter.java
  14. 4 4
      app/src/main/java/com/sikey/skphone/manager/DataManager.java
  15. 8 8
      app/src/main/java/com/sikey/skphone/manager/DatabaseUtils.java
  16. 2 2
      app/src/main/java/com/sikey/skphone/model/BaseModel.java
  17. 1 1
      app/src/main/java/com/sikey/skphone/model/ContactBean.java
  18. 1 1
      app/src/main/java/com/sikey/skphone/model/RecentBean.java
  19. 1 1
      app/src/main/java/com/sikey/skphone/observer/Listener.java
  20. 2 2
      app/src/main/java/com/sikey/skphone/utils/Constant.java
  21. 1 1
      app/src/main/java/com/sikey/skphone/utils/Macros.java
  22. 1 1
      app/src/main/java/com/sikey/skphone/utils/MetaData.java
  23. 1 1
      app/src/main/java/com/sikey/skphone/utils/ResUtils.java
  24. 2 2
      app/src/main/java/com/sikey/skphone/utils/ToolsUtils.java
  25. 1 1
      app/src/main/res/values-night/themes.xml
  26. 1 1
      app/src/main/res/values/strings.xml
  27. 1 1
      app/src/main/res/values/themes.xml
  28. 0 17
      app/src/test/java/com/sikey/skcontact/ExampleUnitTest.java
  29. 1 1
      settings.gradle

+ 1 - 0
.idea/.name

@@ -0,0 +1 @@
+skphone

+ 1 - 1
app/build.gradle

@@ -6,7 +6,7 @@ android {
     compileSdk 32
 
     defaultConfig {
-        applicationId "com.sikey.skcontact"
+        applicationId "com.sikey.skphone"
         minSdk 27
         targetSdk 32
         versionCode 1

+ 0 - 26
app/src/androidTest/java/com/sikey/skcontact/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.sikey.skcontact;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.sikey.skcontact", appContext.getPackageName());
-    }
-}

+ 2 - 2
app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.sikey.skcontact">
+    package="com.sikey.skphone">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.SKContact"
+        android:theme="@style/Theme.skphone"
         >
 
         <activity

+ 1 - 1
app/src/main/java/com/sikey/skcontact/ContactApplication.java → app/src/main/java/com/sikey/skphone/ContactApplication.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact;
+package com.sikey.skphone;
 
 import android.Manifest;
 import android.content.Context;

+ 6 - 6
app/src/main/java/com/sikey/skcontact/activity/BaseActionActivity.java → app/src/main/java/com/sikey/skphone/activity/BaseActionActivity.java

@@ -1,15 +1,15 @@
-package com.sikey.skcontact.activity;
+package com.sikey.skphone.activity;
 
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 
-import com.sikey.skcontact.ContactApplication;
-import com.sikey.skcontact.R;
-import com.sikey.skcontact.model.BaseModel;
-import com.sikey.skcontact.utils.Constant;
-import com.sikey.skcontact.utils.ToolsUtils;
+import com.sikey.skphone.ContactApplication;
+import com.sikey.skphone.R;
+import com.sikey.skphone.model.BaseModel;
+import com.sikey.skphone.utils.Constant;
+import com.sikey.skphone.utils.ToolsUtils;
 
 public class BaseActionActivity extends BaseActivity {
 

+ 7 - 7
app/src/main/java/com/sikey/skcontact/activity/BaseActivity.java → app/src/main/java/com/sikey/skphone/activity/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.activity;
+package com.sikey.skphone.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -8,12 +8,12 @@ import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.sikey.skcontact.R;
-import com.sikey.skcontact.model.BaseModel;
-import com.sikey.skcontact.utils.Constant;
-import com.sikey.skcontact.utils.Macros;
-import com.sikey.skcontact.utils.ResUtils;
-import com.sikey.skcontact.adapter.BaseListAdapter;
+import com.sikey.skphone.R;
+import com.sikey.skphone.model.BaseModel;
+import com.sikey.skphone.utils.Constant;
+import com.sikey.skphone.utils.Macros;
+import com.sikey.skphone.utils.ResUtils;
+import com.sikey.skphone.adapter.BaseListAdapter;
 
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
app/src/main/java/com/sikey/skcontact/activity/BaseInputActivity.java → app/src/main/java/com/sikey/skphone/activity/BaseInputActivity.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.activity;
+package com.sikey.skphone.activity;
 
 import android.os.Bundle;
 import android.view.View;
@@ -6,7 +6,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import com.sikey.skcontact.R;
+import com.sikey.skphone.R;
 
 public class BaseInputActivity extends BaseActionActivity {
     public String mInput = "";

+ 6 - 6
app/src/main/java/com/sikey/skcontact/activity/CallActivity.java → app/src/main/java/com/sikey/skphone/activity/CallActivity.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.activity;
+package com.sikey.skphone.activity;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -6,11 +6,11 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.sikey.skcontact.R;
-import com.sikey.skcontact.model.BaseModel;
-import com.sikey.skcontact.model.ContactBean;
-import com.sikey.skcontact.model.RecentBean;
-import com.sikey.skcontact.utils.Constant;
+import com.sikey.skphone.R;
+import com.sikey.skphone.model.BaseModel;
+import com.sikey.skphone.model.ContactBean;
+import com.sikey.skphone.model.RecentBean;
+import com.sikey.skphone.utils.Constant;
 
 public class CallActivity extends BaseActionActivity {
     private int mType = 0;

+ 8 - 8
app/src/main/java/com/sikey/skcontact/activity/ContactActivity.java → app/src/main/java/com/sikey/skphone/activity/ContactActivity.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.activity;
+package com.sikey.skphone.activity;
 
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -8,17 +8,17 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import com.sikey.skcontact.R;
-import com.sikey.skcontact.adapter.BaseListAdapter;
-import com.sikey.skcontact.manager.DatabaseUtils;
-import com.sikey.skcontact.model.BaseModel;
-import com.sikey.skcontact.model.ContactBean;
-import com.sikey.skcontact.utils.Constant;
+import com.sikey.skphone.R;
+import com.sikey.skphone.adapter.BaseListAdapter;
+import com.sikey.skphone.manager.DatabaseUtils;
+import com.sikey.skphone.model.BaseModel;
+import com.sikey.skphone.model.ContactBean;
+import com.sikey.skphone.utils.Constant;
 
 import java.util.ArrayList;
 
 public class ContactActivity extends BaseActionActivity {
-    public final String TAG = "losion / skcontact :" + getClass().getSimpleName();
+    public final String TAG = "losion / skphone :" + getClass().getSimpleName();
     private ArrayList<ContactBean> mContactList = new ArrayList<>();
 
     @Override

+ 2 - 2
app/src/main/java/com/sikey/skcontact/activity/DialActivity.java → app/src/main/java/com/sikey/skphone/activity/DialActivity.java

@@ -1,6 +1,6 @@
-package com.sikey.skcontact.activity;
+package com.sikey.skphone.activity;
 
-import com.sikey.skcontact.model.RecentBean;
+import com.sikey.skphone.model.RecentBean;
 
 public class DialActivity extends BaseInputActivity {
 

+ 12 - 12
app/src/main/java/com/sikey/skcontact/activity/RecentActivity.java → app/src/main/java/com/sikey/skphone/activity/RecentActivity.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.activity;
+package com.sikey.skphone.activity;
 
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -8,22 +8,22 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import com.sikey.skcontact.R;
-import com.sikey.skcontact.adapter.BaseListAdapter;
-import com.sikey.skcontact.manager.DataManager;
-import com.sikey.skcontact.manager.DatabaseUtils;
-import com.sikey.skcontact.model.BaseModel;
-import com.sikey.skcontact.model.ContactBean;
-import com.sikey.skcontact.model.RecentBean;
-import com.sikey.skcontact.utils.Constant;
-import com.sikey.skcontact.utils.ResUtils;
-import com.sikey.skcontact.utils.ToolsUtils;
+import com.sikey.skphone.R;
+import com.sikey.skphone.adapter.BaseListAdapter;
+import com.sikey.skphone.manager.DataManager;
+import com.sikey.skphone.manager.DatabaseUtils;
+import com.sikey.skphone.model.BaseModel;
+import com.sikey.skphone.model.ContactBean;
+import com.sikey.skphone.model.RecentBean;
+import com.sikey.skphone.utils.Constant;
+import com.sikey.skphone.utils.ResUtils;
+import com.sikey.skphone.utils.ToolsUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class RecentActivity extends BaseActionActivity {
-    public final String TAG = "losion / skcontact :" + getClass().getSimpleName();
+    public final String TAG = "losion / skphone :" + getClass().getSimpleName();
     public static List<RecentBean> mRecentList = new ArrayList<>();
 
     @Override

+ 4 - 4
app/src/main/java/com/sikey/skcontact/adapter/BaseListAdapter.java → app/src/main/java/com/sikey/skphone/adapter/BaseListAdapter.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.adapter;
+package com.sikey.skphone.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -10,9 +10,9 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.sikey.skcontact.R;
-import com.sikey.skcontact.model.BaseModel;
-import com.sikey.skcontact.utils.Constant;
+import com.sikey.skphone.R;
+import com.sikey.skphone.model.BaseModel;
+import com.sikey.skphone.utils.Constant;
 
 import java.util.ArrayList;
 import java.util.List;

+ 4 - 4
app/src/main/java/com/sikey/skcontact/manager/DataManager.java → app/src/main/java/com/sikey/skphone/manager/DataManager.java

@@ -1,13 +1,13 @@
-package com.sikey.skcontact.manager;
+package com.sikey.skphone.manager;
 
 import android.content.Context;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import com.sikey.skcontact.model.ContactBean;
-import com.sikey.skcontact.model.RecentBean;
-import com.sikey.skcontact.utils.ToolsUtils;
+import com.sikey.skphone.model.ContactBean;
+import com.sikey.skphone.model.RecentBean;
+import com.sikey.skphone.utils.ToolsUtils;
 
 import java.util.ArrayList;
 

+ 8 - 8
app/src/main/java/com/sikey/skcontact/manager/DatabaseUtils.java → app/src/main/java/com/sikey/skphone/manager/DatabaseUtils.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.manager;
+package com.sikey.skphone.manager;
 
 import android.annotation.SuppressLint;
 import android.content.ContentResolver;
@@ -8,18 +8,18 @@ import android.net.Uri;
 import android.provider.CallLog;
 import android.util.Log;
 
-import com.sikey.skcontact.ContactApplication;
-import com.sikey.skcontact.model.ContactBean;
-import com.sikey.skcontact.model.RecentBean;
-import com.sikey.skcontact.utils.Macros;
-import com.sikey.skcontact.utils.MetaData;
-import com.sikey.skcontact.utils.ToolsUtils;
+import com.sikey.skphone.ContactApplication;
+import com.sikey.skphone.model.ContactBean;
+import com.sikey.skphone.model.RecentBean;
+import com.sikey.skphone.utils.Macros;
+import com.sikey.skphone.utils.MetaData;
+import com.sikey.skphone.utils.ToolsUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class DatabaseUtils {
-    public static String TAG = "losion / skcontact :" + "DatabaseUtils";
+    public static String TAG = "losion / skphone :" + "DatabaseUtils";
     public DatabaseUtils() {}
 
     @SuppressLint("Range")

+ 2 - 2
app/src/main/java/com/sikey/skcontact/model/BaseModel.java → app/src/main/java/com/sikey/skphone/model/BaseModel.java

@@ -1,6 +1,6 @@
-package com.sikey.skcontact.model;
+package com.sikey.skphone.model;
 
-import com.sikey.skcontact.utils.Constant;
+import com.sikey.skphone.utils.Constant;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/sikey/skcontact/model/ContactBean.java → app/src/main/java/com/sikey/skphone/model/ContactBean.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.model;
+package com.sikey.skphone.model;
 
 public class ContactBean extends BaseModel {
     public long _id = 0;

+ 1 - 1
app/src/main/java/com/sikey/skcontact/model/RecentBean.java → app/src/main/java/com/sikey/skphone/model/RecentBean.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.model;
+package com.sikey.skphone.model;
 
 public class RecentBean extends BaseModel {
     public long _id = 0;

+ 1 - 1
app/src/main/java/com/sikey/skcontact/observer/Listener.java → app/src/main/java/com/sikey/skphone/observer/Listener.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.observer;
+package com.sikey.skphone.observer;
 
 public class Listener {
     public interface VideoListener {

+ 2 - 2
app/src/main/java/com/sikey/skcontact/utils/Constant.java → app/src/main/java/com/sikey/skphone/utils/Constant.java

@@ -1,7 +1,7 @@
-package com.sikey.skcontact.utils;
+package com.sikey.skphone.utils;
 
 public class Constant {
-    public static String PACKAGE_NAME = "com.sikey.skcontact";
+    public static String PACKAGE_NAME = "com.sikey.skphone";
     public static String INTENT_VIEW_TYPE = "intent_view_type";
     public static String INTENT_VIEW_VALUE = "intent_view_value";
 

+ 1 - 1
app/src/main/java/com/sikey/skcontact/utils/Macros.java → app/src/main/java/com/sikey/skphone/utils/Macros.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.utils;
+package com.sikey.skphone.utils;
 
 public class Macros {
     public static boolean DEBUG = true;

+ 1 - 1
app/src/main/java/com/sikey/skcontact/utils/MetaData.java → app/src/main/java/com/sikey/skphone/utils/MetaData.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.utils;
+package com.sikey.skphone.utils;
 
 public class MetaData {
     public final static String AUTHORITIES_CONTACTS = "content://com.sikey.WatchContactProvider";

+ 1 - 1
app/src/main/java/com/sikey/skcontact/utils/ResUtils.java → app/src/main/java/com/sikey/skphone/utils/ResUtils.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.utils;
+package com.sikey.skphone.utils;
 import android.content.Context;
 
 import java.util.Locale;

+ 2 - 2
app/src/main/java/com/sikey/skcontact/utils/ToolsUtils.java → app/src/main/java/com/sikey/skphone/utils/ToolsUtils.java

@@ -1,4 +1,4 @@
-package com.sikey.skcontact.utils;
+package com.sikey.skphone.utils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -23,7 +23,7 @@ import java.util.Date;
 import java.util.Locale;
 
 public class ToolsUtils {
-    public static String TAG = "losion / skcontact :" + "ToolsUtils";
+    public static String TAG = "losion / skphone :" + "ToolsUtils";
 
     public static int dip2px(Context context, float dpValue) {
         float scale = context.getResources().getDisplayMetrics().density;

+ 1 - 1
app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.SKContact" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.skphone" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">SKContact</string>
+    <string name="app_name">skphone</string>
     <string name="app_dial">拨号</string>
     <string name="app_contact">联系人</string>
     <string name="app_recent">通话记录</string>

+ 1 - 1
app/src/main/res/values/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.SKContact" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.skphone" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

+ 0 - 17
app/src/test/java/com/sikey/skcontact/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.sikey.skcontact;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}

+ 1 - 1
settings.gradle

@@ -12,5 +12,5 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "SKContact"
+rootProject.name = "skphone"
 include ':app'