From 7bf75af9a1cdc6eec30a23c26dfe780fcc7cb4bb Mon Sep 17 00:00:00 2001
From: Seidko <64234553+Seidko@users.noreply.github.com>
Date: Fri, 18 Nov 2022 22:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20BREAKING=20CHANGE:=20Rename=20pr?=
 =?UTF-8?q?oject=20to=20"Phocam"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 25 ++++++++++---------
 .../ExampleInstrumentedTest.kt                |  4 +--
 app/src/main/AndroidManifest.xml              |  7 +++---
 .../seidko/{phomic => phocam}/MainActivity.kt | 10 ++++----
 .../base/adapter/ConnectionRecyclerAdapter.kt |  8 +++---
 .../seidko/phocam/data/PhocamApplication.kt   |  7 ++++++
 .../data/entities/Connection.kt               |  2 +-
 .../ui/home/HomeFragment.kt                   | 15 ++++++-----
 .../ui/home/HomeViewModel.kt                  |  2 +-
 .../seidko/phomic/data/PhomicApplication.kt   |  7 ------
 app/src/main/res/layout/app_bar_main.xml      |  4 +--
 ...ragment_phomic.xml => fragment_phocam.xml} |  0
 app/src/main/res/layout/item_connection.xml   |  2 +-
 .../main/res/navigation/mobile_navigation.xml |  4 +--
 app/src/main/res/values-night/themes.xml      |  8 +++---
 app/src/main/res/values/strings.xml           |  4 +--
 app/src/main/res/values/themes.xml            | 10 ++++----
 .../{phomic => phocam}/ExampleUnitTest.kt     |  2 +-
 settings.gradle                               |  2 +-
 19 files changed, 61 insertions(+), 62 deletions(-)
 rename app/src/androidTest/java/com/seidko/{phomic => phocam}/ExampleInstrumentedTest.kt (86%)
 rename app/src/main/java/com/seidko/{phomic => phocam}/MainActivity.kt (91%)
 rename app/src/main/java/com/seidko/{phomic => phocam}/base/adapter/ConnectionRecyclerAdapter.kt (92%)
 create mode 100644 app/src/main/java/com/seidko/phocam/data/PhocamApplication.kt
 rename app/src/main/java/com/seidko/{phomic => phocam}/data/entities/Connection.kt (91%)
 rename app/src/main/java/com/seidko/{phomic => phocam}/ui/home/HomeFragment.kt (79%)
 rename app/src/main/java/com/seidko/{phomic => phocam}/ui/home/HomeViewModel.kt (89%)
 delete mode 100644 app/src/main/java/com/seidko/phomic/data/PhomicApplication.kt
 rename app/src/main/res/layout/{fragment_phomic.xml => fragment_phocam.xml} (100%)
 rename app/src/test/java/com/seidko/{phomic => phocam}/ExampleUnitTest.kt (92%)

diff --git a/app/build.gradle b/app/build.gradle
index cf31c20..6d8ea70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,13 @@ plugins {
 }
 
 android {
-    namespace 'com.seidko.phomic'
+    namespace 'com.seidko.phocam'
     compileSdk 32
 
     defaultConfig {
-        applicationId "com.seidko.phomic"
+        applicationId "com.seidko.phocam"
         minSdk 26
+        //noinspection OldTargetApi
         targetSdk 32
         versionCode 1
         versionName "1.0"
@@ -37,15 +38,15 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/seidko/phomic/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/seidko/phocam/ExampleInstrumentedTest.kt
similarity index 86%
rename from app/src/androidTest/java/com/seidko/phomic/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/com/seidko/phocam/ExampleInstrumentedTest.kt
index 6c6f06b..703298e 100644
--- a/app/src/androidTest/java/com/seidko/phomic/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/seidko/phocam/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.seidko.phomic
+package com.seidko.phocam
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.seidko.phomic", appContext.packageName)
+        assertEquals("com.seidko.phocam", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b130fe..d9655b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,15 +10,14 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Phomic"
+        android:theme="@style/Theme.Phocam"
         tools:targetApi="31"
-        android:name=".data.PhomicApplication"
+        android:name=".data.PhocamApplication"
         >
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Phomic.NoActionBar">
+            android:theme="@style/Theme.Phocam.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/seidko/phomic/MainActivity.kt b/app/src/main/java/com/seidko/phocam/MainActivity.kt
similarity index 91%
rename from app/src/main/java/com/seidko/phomic/MainActivity.kt
rename to app/src/main/java/com/seidko/phocam/MainActivity.kt
index ebfefd3..872d583 100644
--- a/app/src/main/java/com/seidko/phomic/MainActivity.kt
+++ b/app/src/main/java/com/seidko/phocam/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.seidko.phomic
+package com.seidko.phocam
 
 
 import android.os.Bundle
@@ -12,18 +12,18 @@ import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.appcompat.app.AppCompatActivity
-import com.seidko.phomic.data.PhomicApplication
-import com.seidko.phomic.databinding.ActivityMainBinding
+import com.seidko.phocam.data.PhocamApplication
+import com.seidko.phocam.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityMainBinding
-    private lateinit var app: PhomicApplication
+    private lateinit var app: PhocamApplication
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        app = application as PhomicApplication
+        app = application as PhocamApplication
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
diff --git a/app/src/main/java/com/seidko/phomic/base/adapter/ConnectionRecyclerAdapter.kt b/app/src/main/java/com/seidko/phocam/base/adapter/ConnectionRecyclerAdapter.kt
similarity index 92%
rename from app/src/main/java/com/seidko/phomic/base/adapter/ConnectionRecyclerAdapter.kt
rename to app/src/main/java/com/seidko/phocam/base/adapter/ConnectionRecyclerAdapter.kt
index b2102f0..2b6a679 100644
--- a/app/src/main/java/com/seidko/phomic/base/adapter/ConnectionRecyclerAdapter.kt
+++ b/app/src/main/java/com/seidko/phocam/base/adapter/ConnectionRecyclerAdapter.kt
@@ -1,4 +1,4 @@
-package com.seidko.phomic.base.adapter
+package com.seidko.phocam.base.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.seidko.phomic.R
-import com.seidko.phomic.data.entities.Connection
-import com.seidko.phomic.data.entities.ConnectionStatus
+import com.seidko.phocam.R
+import com.seidko.phocam.data.entities.Connection
+import com.seidko.phocam.data.entities.ConnectionStatus
 
 
 class ConnectionRecyclerAdapter(private var connectionArray: ArrayList<Connection>) :
diff --git a/app/src/main/java/com/seidko/phocam/data/PhocamApplication.kt b/app/src/main/java/com/seidko/phocam/data/PhocamApplication.kt
new file mode 100644
index 0000000..b453aa8
--- /dev/null
+++ b/app/src/main/java/com/seidko/phocam/data/PhocamApplication.kt
@@ -0,0 +1,7 @@
+package com.seidko.phocam.data
+
+import android.app.Application
+
+class PhocamApplication: Application() {
+    var running = false
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/seidko/phomic/data/entities/Connection.kt b/app/src/main/java/com/seidko/phocam/data/entities/Connection.kt
similarity index 91%
rename from app/src/main/java/com/seidko/phomic/data/entities/Connection.kt
rename to app/src/main/java/com/seidko/phocam/data/entities/Connection.kt
index 5bda97d..c4010c0 100644
--- a/app/src/main/java/com/seidko/phomic/data/entities/Connection.kt
+++ b/app/src/main/java/com/seidko/phocam/data/entities/Connection.kt
@@ -1,4 +1,4 @@
-package com.seidko.phomic.data.entities
+package com.seidko.phocam.data.entities
 
 /**
  * Connection data entity
diff --git a/app/src/main/java/com/seidko/phomic/ui/home/HomeFragment.kt b/app/src/main/java/com/seidko/phocam/ui/home/HomeFragment.kt
similarity index 79%
rename from app/src/main/java/com/seidko/phomic/ui/home/HomeFragment.kt
rename to app/src/main/java/com/seidko/phocam/ui/home/HomeFragment.kt
index 7be559f..22198d9 100644
--- a/app/src/main/java/com/seidko/phomic/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/seidko/phocam/ui/home/HomeFragment.kt
@@ -1,4 +1,4 @@
-package com.seidko.phomic.ui.home
+package com.seidko.phocam.ui.home
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,14 +7,14 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.seidko.phomic.base.adapter.ConnectionRecyclerAdapter
-import com.seidko.phomic.data.entities.Connection
-import com.seidko.phomic.data.entities.ConnectionType
-import com.seidko.phomic.databinding.FragmentPhomicBinding
+import com.seidko.phocam.base.adapter.ConnectionRecyclerAdapter
+import com.seidko.phocam.data.entities.Connection
+import com.seidko.phocam.data.entities.ConnectionType
+import com.seidko.phocam.databinding.FragmentPhocamBinding
 
 class HomeFragment : Fragment() {
 
-    private var _binding: FragmentPhomicBinding? = null
+    private var _binding: FragmentPhocamBinding? = null
 
     // This property is only valid between onCreateView and
     // onDestroyView.
@@ -29,7 +29,7 @@ class HomeFragment : Fragment() {
         @Suppress("UNUSED_VARIABLE")
         val homeViewModel = ViewModelProvider(this)[HomeViewModel::class.java]
 
-        _binding = FragmentPhomicBinding.inflate(inflater, container, false)
+        _binding = FragmentPhocamBinding.inflate(inflater, container, false)
         val root: View = binding.root
         val connectionRecyclerView = binding.connectionRecyclerView
         val layoutManager = LinearLayoutManager(this.context)
@@ -41,7 +41,6 @@ class HomeFragment : Fragment() {
         connectionRecyclerView.adapter = ConnectionRecyclerAdapter(connectionList)
         connectionRecyclerView.layoutManager = layoutManager
 
-
         return root
     }
 
diff --git a/app/src/main/java/com/seidko/phomic/ui/home/HomeViewModel.kt b/app/src/main/java/com/seidko/phocam/ui/home/HomeViewModel.kt
similarity index 89%
rename from app/src/main/java/com/seidko/phomic/ui/home/HomeViewModel.kt
rename to app/src/main/java/com/seidko/phocam/ui/home/HomeViewModel.kt
index 5aaef3b..4d59858 100644
--- a/app/src/main/java/com/seidko/phomic/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/seidko/phocam/ui/home/HomeViewModel.kt
@@ -1,4 +1,4 @@
-package com.seidko.phomic.ui.home
+package com.seidko.phocam.ui.home
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/seidko/phomic/data/PhomicApplication.kt b/app/src/main/java/com/seidko/phomic/data/PhomicApplication.kt
deleted file mode 100644
index a25ccb6..0000000
--- a/app/src/main/java/com/seidko/phomic/data/PhomicApplication.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.seidko.phomic.data
-
-import android.app.Application
-
-class PhomicApplication: Application() {
-    var running = false
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 4a59c5e..65e5a7b 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -9,14 +9,14 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/Theme.Phomic.AppBarOverlay">
+        android:theme="@style/Theme.Phocam.AppBarOverlay">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.Phomic.PopupOverlay" />
+            app:popupTheme="@style/Theme.Phocam.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_phomic.xml b/app/src/main/res/layout/fragment_phocam.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_phomic.xml
rename to app/src/main/res/layout/fragment_phocam.xml
diff --git a/app/src/main/res/layout/item_connection.xml b/app/src/main/res/layout/item_connection.xml
index d4c6c2b..c7bb749 100644
--- a/app/src/main/res/layout/item_connection.xml
+++ b/app/src/main/res/layout/item_connection.xml
@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/Theme.Phomic.ListItem"
+    android:theme="@style/Theme.Phocam.ListItem"
     android:background="@drawable/bg_shape"
     android:layout_marginTop="8dp">
 
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 121812b..5658b88 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/nav_home"
-        android:name="com.seidko.phomic.ui.home.HomeFragment"
+        android:name="com.seidko.phocam.ui.home.HomeFragment"
         android:label="@string/menu_home"
-        tools:layout="@layout/fragment_phomic" />
+        tools:layout="@layout/fragment_phocam" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index afeadc3..3c9aefe 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.Phomic" parent="Theme.MaterialComponents.DayNight">
+    <style name="Theme.Phocam" parent="Theme.MaterialComponents.DayNight">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/gray_700</item>
         <item name="colorOnPrimary">@color/white</item>
@@ -14,19 +14,19 @@
         <item name="backgroundColor">@color/gray_700</item>
     </style>
 
-    <style name="Theme.Phomic.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+    <style name="Theme.Phocam.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">@color/white</item>
     </style>
 
     <!-- 标记一个坑: Menu的字体颜色修改在这里-->
-    <style name="Theme.Phomic.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" >
+    <style name="Theme.Phocam.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" >
         <!-- ActionBar上的title的字体颜色 -->
         <item name="titleTextColor">?attr/colorOnPrimary</item>
         <!-- ActionBar上Menu的字体颜色 -->
         <item name="actionMenuTextColor">?attr/colorOnPrimary</item>
     </style>
 
-    <style name="Theme.Phomic.ListItem">
+    <style name="Theme.Phocam.ListItem">
         <item name="android:textColor">@color/white</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb4fc54..3dbb9e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <resources>
-    <string name="app_name" translatable="false">Phomic</string>
+    <string name="app_name" translatable="false">Phocam</string>
     <string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
     <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
-    <string name="nav_header_title" translatable="false">Phomic</string>
+    <string name="nav_header_title" translatable="false">Phocam</string>
     <string name="nav_header_subtitle" translatable="false">Seidko@github.com</string>
     <string name="nav_header_desc" translatable="false">Navigation header</string>
     <string name="action_settings">Settings</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 85fd62e..1eb5577 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.Phomic" parent="Theme.MaterialComponents.DayNight">
+    <style name="Theme.Phocam" parent="Theme.MaterialComponents.DayNight">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/gray_300</item>
         <item name="colorPrimaryVariant">@color/gray_300</item>
@@ -16,18 +16,18 @@
         <item name="backgroundColor">@color/gray_200</item>
     </style>
 
-    <style name="Theme.Phomic.NoActionBar">
+    <style name="Theme.Phocam.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="Theme.Phomic.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+    <style name="Theme.Phocam.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">@color/black</item>
     </style>
 
-    <style name="Theme.Phomic.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="Theme.Phocam.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="Theme.Phomic.ListItem">
+    <style name="Theme.Phocam.ListItem">
         <item name="android:textColor">@color/black</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/seidko/phomic/ExampleUnitTest.kt b/app/src/test/java/com/seidko/phocam/ExampleUnitTest.kt
similarity index 92%
rename from app/src/test/java/com/seidko/phomic/ExampleUnitTest.kt
rename to app/src/test/java/com/seidko/phocam/ExampleUnitTest.kt
index 5024a39..7fd1e77 100644
--- a/app/src/test/java/com/seidko/phomic/ExampleUnitTest.kt
+++ b/app/src/test/java/com/seidko/phocam/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.seidko.phomic
+package com.seidko.phocam
 
 import org.junit.Test
 
diff --git a/settings.gradle b/settings.gradle
index 6e9addc..cef0538 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,5 +12,5 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "Phomic"
+rootProject.name = "Phocam"
 include ':app'