changed package name

yamin8000 · Jan 15, 2022 · 7a9c301 · 7a9c301
1 parent b3376b9
commit 7a9c301
Show file tree

Hide file tree

Showing 46 changed files with 259 additions and 259 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ android {
     buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "com.github.yamin8000.fare"
+        applicationId "com.github.yamin8000.fare2"
         minSdkVersion 21
         targetSdkVersion 32
         versionCode 4

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -36,7 +36,7 @@
 #-keep class com.google.gson.stream.** { *; }
 
 # Application classes that will be serialized/deserialized over Gson
--keep class com.github.yamin8000.fare.model.** { <fields>; }
+-keep class com.github.yamin8000.fare2.model.** { <fields>; }
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?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.github.yamin8000.fare">
+    package="com.github.yamin8000.fare2">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".util.MyApp"
+        android:name="com.github.yamin8000.fare2.util.MyApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -16,7 +16,7 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
         <activity
-            android:name=".ui.MainActivity"
+            android:name="com.github.yamin8000.fare2.ui.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|locale|screenLayout|screenSize"
             android:exported="true">
             <intent-filter>

diff --git a/...8000/fare/about/AboutDeveloperFragment.kt → ...000/fare2/about/AboutDeveloperFragment.kt b/...8000/fare/about/AboutDeveloperFragment.kt → ...000/fare2/about/AboutDeveloperFragment.kt
@@ -18,10 +18,10 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.about
+package com.github.yamin8000.fare2.about
 
-import com.github.yamin8000.fare.databinding.FragmentAboutDeveloperBinding
-import com.github.yamin8000.fare.ui.fragment.BaseFragment
+import com.github.yamin8000.fare2.databinding.FragmentAboutDeveloperBinding
+import com.github.yamin8000.fare2.ui.fragment.BaseFragment
 
 class AboutDeveloperFragment :
     BaseFragment<FragmentAboutDeveloperBinding>({ FragmentAboutDeveloperBinding.inflate(it) })
diff --git a/...hub/yamin8000/fare/about/AboutFragment.kt → ...ub/yamin8000/fare2/about/AboutFragment.kt b/...hub/yamin8000/fare/about/AboutFragment.kt → ...ub/yamin8000/fare2/about/AboutFragment.kt
@@ -18,15 +18,15 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.about
+package com.github.yamin8000.fare2.about
 
 import android.os.Bundle
 import android.view.View
 import androidx.navigation.fragment.findNavController
-import com.github.yamin8000.fare.R
-import com.github.yamin8000.fare.databinding.FragmentAboutBinding
-import com.github.yamin8000.fare.ui.fragment.BaseFragment
-import com.github.yamin8000.fare.util.Utility.handleCrash
+import com.github.yamin8000.fare2.R
+import com.github.yamin8000.fare2.databinding.FragmentAboutBinding
+import com.github.yamin8000.fare2.ui.fragment.BaseFragment
+import com.github.yamin8000.fare2.util.Utility.handleCrash
 
 class AboutFragment : BaseFragment<FragmentAboutBinding>({ FragmentAboutBinding.inflate(it) }) {
 

diff --git a/...b/yamin8000/fare/about/AppHelpFragment.kt → .../yamin8000/fare2/about/AppHelpFragment.kt b/...b/yamin8000/fare/about/AppHelpFragment.kt → .../yamin8000/fare2/about/AppHelpFragment.kt
@@ -18,9 +18,9 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.about
+package com.github.yamin8000.fare2.about
 
-import com.github.yamin8000.fare.databinding.FragmentHelpBinding
-import com.github.yamin8000.fare.ui.fragment.BaseFragment
+import com.github.yamin8000.fare2.databinding.FragmentHelpBinding
+import com.github.yamin8000.fare2.ui.fragment.BaseFragment
 
 class AppHelpFragment : BaseFragment<FragmentHelpBinding>({ FragmentHelpBinding.inflate(it) })
diff --git a/.../yamin8000/fare/about/FeedbackFragment.kt → ...yamin8000/fare2/about/FeedbackFragment.kt b/.../yamin8000/fare/about/FeedbackFragment.kt → ...yamin8000/fare2/about/FeedbackFragment.kt
@@ -18,26 +18,26 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.about
+package com.github.yamin8000.fare2.about
 
 import android.os.Bundle
 import android.text.Editable
 import android.view.View
-import com.github.yamin8000.fare.R
-import com.github.yamin8000.fare.databinding.FragmentFeedbackBinding
-import com.github.yamin8000.fare.model.Feedback
-import com.github.yamin8000.fare.ui.fragment.BaseFragment
-import com.github.yamin8000.fare.util.CONSTANTS.DATE
-import com.github.yamin8000.fare.util.CONSTANTS.FEEDBACK
-import com.github.yamin8000.fare.util.CONSTANTS.FEEDBACK_PREFS
-import com.github.yamin8000.fare.util.SharedPrefs
-import com.github.yamin8000.fare.util.Utility.handleCrash
-import com.github.yamin8000.fare.util.Utility.hideKeyboard
-import com.github.yamin8000.fare.util.helpers.ErrorHelper.netError
-import com.github.yamin8000.fare.util.helpers.ErrorHelper.snack
-import com.github.yamin8000.fare.web.APIs
-import com.github.yamin8000.fare.web.Web
-import com.github.yamin8000.fare.web.Web.asyncResponse
+import com.github.yamin8000.fare2.R
+import com.github.yamin8000.fare2.databinding.FragmentFeedbackBinding
+import com.github.yamin8000.fare2.model.Feedback
+import com.github.yamin8000.fare2.ui.fragment.BaseFragment
+import com.github.yamin8000.fare2.util.CONSTANTS.DATE
+import com.github.yamin8000.fare2.util.CONSTANTS.FEEDBACK
+import com.github.yamin8000.fare2.util.CONSTANTS.FEEDBACK_PREFS
+import com.github.yamin8000.fare2.util.SharedPrefs
+import com.github.yamin8000.fare2.util.Utility.handleCrash
+import com.github.yamin8000.fare2.util.Utility.hideKeyboard
+import com.github.yamin8000.fare2.util.helpers.ErrorHelper.netError
+import com.github.yamin8000.fare2.util.helpers.ErrorHelper.snack
+import com.github.yamin8000.fare2.web.APIs
+import com.github.yamin8000.fare2.web.Web
+import com.github.yamin8000.fare2.web.Web.asyncResponse
 import com.google.android.material.snackbar.Snackbar
 import java.time.LocalDateTime
 

diff --git a/...b/yamin8000/fare/about/LicenseFragment.kt → .../yamin8000/fare2/about/LicenseFragment.kt b/...b/yamin8000/fare/about/LicenseFragment.kt → .../yamin8000/fare2/about/LicenseFragment.kt
@@ -18,27 +18,27 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.about
+package com.github.yamin8000.fare2.about
 
 import android.content.Context
 import android.os.Bundle
 import android.text.util.Linkify
 import android.view.View
 import androidx.core.text.util.LinkifyCompat
-import com.github.yamin8000.fare.R
-import com.github.yamin8000.fare.cache.Cache
-import com.github.yamin8000.fare.databinding.FragmentLicenseBinding
-import com.github.yamin8000.fare.model.License
-import com.github.yamin8000.fare.ui.fragment.BaseFragment
-import com.github.yamin8000.fare.util.CONSTANTS.LICENSE_PREFS
-import com.github.yamin8000.fare.util.Utility.handleCrash
-import com.github.yamin8000.fare.util.helpers.ErrorHelper.netError
-import com.github.yamin8000.fare.util.helpers.ErrorHelper.snack
-import com.github.yamin8000.fare.web.APIs
-import com.github.yamin8000.fare.web.Web
-import com.github.yamin8000.fare.web.Web.async
-import com.github.yamin8000.fare.web.Web.fromJsonArray
-import com.github.yamin8000.fare.web.Web.toJsonArray
+import com.github.yamin8000.fare2.R
+import com.github.yamin8000.fare2.cache.Cache
+import com.github.yamin8000.fare2.databinding.FragmentLicenseBinding
+import com.github.yamin8000.fare2.model.License
+import com.github.yamin8000.fare2.ui.fragment.BaseFragment
+import com.github.yamin8000.fare2.util.CONSTANTS.LICENSE_PREFS
+import com.github.yamin8000.fare2.util.Utility.handleCrash
+import com.github.yamin8000.fare2.util.helpers.ErrorHelper.netError
+import com.github.yamin8000.fare2.util.helpers.ErrorHelper.snack
+import com.github.yamin8000.fare2.web.APIs
+import com.github.yamin8000.fare2.web.Web
+import com.github.yamin8000.fare2.web.Web.async
+import com.github.yamin8000.fare2.web.Web.fromJsonArray
+import com.github.yamin8000.fare2.web.Web.toJsonArray
 
 class LicenseFragment :
     BaseFragment<FragmentLicenseBinding>({ FragmentLicenseBinding.inflate(it) }) {

diff --git a/.../com/github/yamin8000/fare/cache/Cache.kt → ...com/github/yamin8000/fare2/cache/Cache.kt b/.../com/github/yamin8000/fare/cache/Cache.kt → ...com/github/yamin8000/fare2/cache/Cache.kt
@@ -18,11 +18,11 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.cache
+package com.github.yamin8000.fare2.cache
 
 import android.content.Context
-import com.github.yamin8000.fare.util.CONSTANTS.CACHE
-import com.github.yamin8000.fare.util.SharedPrefs
+import com.github.yamin8000.fare2.util.CONSTANTS.CACHE
+import com.github.yamin8000.fare2.util.SharedPrefs
 import java.time.LocalDateTime
 
 /**

diff --git a/...ithub/yamin8000/fare/cache/CachePolicy.kt → ...thub/yamin8000/fare2/cache/CachePolicy.kt b/...ithub/yamin8000/fare/cache/CachePolicy.kt → ...thub/yamin8000/fare2/cache/CachePolicy.kt
@@ -20,7 +20,7 @@
 
 @file:Suppress("unused")
 
-package com.github.yamin8000.fare.cache
+package com.github.yamin8000.fare2.cache
 
 import java.time.LocalDateTime
 

diff --git a/...a/com/github/yamin8000/fare/model/City.kt → .../com/github/yamin8000/fare2/model/City.kt b/...a/com/github/yamin8000/fare/model/City.kt → .../com/github/yamin8000/fare2/model/City.kt
@@ -18,10 +18,10 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
-import com.github.yamin8000.fare.util.CONSTANTS.COUNTY_ID
-import com.github.yamin8000.fare.util.CONSTANTS.STATE_ID
+import com.github.yamin8000.fare2.util.CONSTANTS.COUNTY_ID
+import com.github.yamin8000.fare2.util.CONSTANTS.STATE_ID
 import com.google.gson.annotations.SerializedName
 
 data class City(

diff --git a/.../github/yamin8000/fare/model/CityExtra.kt → ...github/yamin8000/fare2/model/CityExtra.kt b/.../github/yamin8000/fare/model/CityExtra.kt → ...github/yamin8000/fare2/model/CityExtra.kt
@@ -18,9 +18,9 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
-import com.github.yamin8000.fare.util.CONSTANTS.CITY_ID
+import com.github.yamin8000.fare2.util.CONSTANTS.CITY_ID
 import com.google.gson.annotations.SerializedName
 
 data class CityExtra(

diff --git a/...github/yamin8000/fare/model/CityJoined.kt → ...ithub/yamin8000/fare2/model/CityJoined.kt b/...github/yamin8000/fare/model/CityJoined.kt → ...ithub/yamin8000/fare2/model/CityJoined.kt
@@ -18,7 +18,7 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 data class CityJoined(
     val id: Int,

diff --git a/...ithub/yamin8000/fare/model/CompactLine.kt → ...thub/yamin8000/fare2/model/CompactLine.kt b/...ithub/yamin8000/fare/model/CompactLine.kt → ...thub/yamin8000/fare2/model/CompactLine.kt
@@ -18,7 +18,7 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 data class CompactLine(
     val code: String?,

diff --git a/...com/github/yamin8000/fare/model/County.kt → ...om/github/yamin8000/fare2/model/County.kt b/...com/github/yamin8000/fare/model/County.kt → ...om/github/yamin8000/fare2/model/County.kt
@@ -1,4 +1,4 @@
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...m/github/yamin8000/fare/model/Feedback.kt → .../github/yamin8000/fare2/model/Feedback.kt b/...m/github/yamin8000/fare/model/Feedback.kt → .../github/yamin8000/fare2/model/Feedback.kt
@@ -18,7 +18,7 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 data class Feedback(
     val feedback: String,

diff --git a/...om/github/yamin8000/fare/model/License.kt → ...m/github/yamin8000/fare2/model/License.kt b/...om/github/yamin8000/fare/model/License.kt → ...m/github/yamin8000/fare2/model/License.kt
@@ -18,7 +18,7 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 data class License(
     val id: String,

diff --git a/...a/com/github/yamin8000/fare/model/Line.kt → .../com/github/yamin8000/fare2/model/Line.kt b/...a/com/github/yamin8000/fare/model/Line.kt → .../com/github/yamin8000/fare2/model/Line.kt
@@ -18,9 +18,9 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
-import com.github.yamin8000.fare.util.CONSTANTS.CITY_ID
+import com.github.yamin8000.fare2.util.CONSTANTS.CITY_ID
 import com.google.gson.annotations.SerializedName
 
 data class Line(

diff --git a/...m/github/yamin8000/fare/model/LogModel.kt → .../github/yamin8000/fare2/model/LogModel.kt b/...m/github/yamin8000/fare/model/LogModel.kt → .../github/yamin8000/fare2/model/LogModel.kt
@@ -18,6 +18,6 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 data class LogModel(val stacktrace: String)
diff --git a/.../com/github/yamin8000/fare/model/Price.kt → ...com/github/yamin8000/fare2/model/Price.kt b/.../com/github/yamin8000/fare/model/Price.kt → ...com/github/yamin8000/fare2/model/Price.kt
@@ -18,7 +18,7 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...ub/yamin8000/fare/model/PriceReference.kt → ...b/yamin8000/fare2/model/PriceReference.kt b/...ub/yamin8000/fare/model/PriceReference.kt → ...b/yamin8000/fare2/model/PriceReference.kt
@@ -18,9 +18,9 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
-import com.github.yamin8000.fare.util.CONSTANTS.CITY_ID
+import com.github.yamin8000.fare2.util.CONSTANTS.CITY_ID
 import com.google.gson.annotations.SerializedName
 
 data class PriceReference(

diff --git a/.../com/github/yamin8000/fare/model/State.kt → ...com/github/yamin8000/fare2/model/State.kt b/.../com/github/yamin8000/fare/model/State.kt → ...com/github/yamin8000/fare2/model/State.kt
@@ -18,7 +18,7 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.model
+package com.github.yamin8000.fare2.model
 
 data class State(
     val id: Int,

diff --git a/...000/fare/search/city/SearchCityAdapter.kt → ...00/fare2/search/city/SearchCityAdapter.kt b/...000/fare/search/city/SearchCityAdapter.kt → ...00/fare2/search/city/SearchCityAdapter.kt
@@ -18,15 +18,15 @@
  *     along with Fare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.github.yamin8000.fare.search.city
+package com.github.yamin8000.fare2.search.city
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.github.yamin8000.fare.databinding.SearchCityItemBinding
-import com.github.yamin8000.fare.model.CityJoined
+import com.github.yamin8000.fare2.databinding.SearchCityItemBinding
+import com.github.yamin8000.fare2.model.CityJoined
 
 class SearchCityAdapter(private val clickListener: (String, String) -> Unit) :
     RecyclerView.Adapter<SearchCityViewHolder>() {