Refactor things

azurlane-api · Nov 30, 2019 · acb0b70 · acb0b70
1 parent da4fcd0
commit acb0b70
Show file tree

Hide file tree

Showing 44 changed files with 89 additions and 111 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -24,7 +24,7 @@ android {
     compileSdkVersion(Versions.targetSdk)
 
     defaultConfig {
-        applicationId = "info.kurozeropb.azurlane"
+        applicationId = "info.kurozeropb.alcompanion"
         minSdkVersion(Versions.minSdk)
         targetSdkVersion(Versions.targetSdk)
         versionCode = Versions.generateVersionCode()

diff --git a/...eropb/azurlane/ExampleInstrumentedTest.kt → ...pb/alcompanion/ExampleInstrumentedTest.kt b/...eropb/azurlane/ExampleInstrumentedTest.kt → ...pb/alcompanion/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane
+package info.kurozeropb.alcompanion
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/app/src/main/AndroidManifest.xml b/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="info.kurozeropb.azurlane">
+    package="info.kurozeropb.alcompanion">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -15,7 +15,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:hardwareAccelerated="true">
-        <activity android:name=".ui.SplashActivity"
+        <activity android:name="info.kurozeropb.alcompanion.ui.SplashActivity"
             android:screenOrientation="sensorPortrait"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>
@@ -25,31 +25,31 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.MainActivity"
+        <activity android:name="info.kurozeropb.alcompanion.ui.MainActivity"
             android:theme="@style/AppTheme.DarkNavBar"
             android:screenOrientation="sensorPortrait"
             tools:ignore="LockedOrientationActivity" />
 
-        <activity android:name=".ui.ShipActivity"
+        <activity android:name="info.kurozeropb.alcompanion.ui.ShipActivity"
             android:screenOrientation="sensorPortrait"
             tools:ignore="LockedOrientationActivity" />
 
-        <activity android:name=".ui.SettingsActivity"
+        <activity android:name="info.kurozeropb.alcompanion.ui.SettingsActivity"
             android:screenOrientation="sensorPortrait"
             tools:ignore="LockedOrientationActivity" />
 
-        <activity android:name=".ui.EquipmentListActivity"
+        <activity android:name="info.kurozeropb.alcompanion.ui.EquipmentListActivity"
             android:theme="@style/AppTheme.DarkNavBar"
             android:screenOrientation="sensorPortrait"
             tools:ignore="LockedOrientationActivity" />
 
-        <activity android:name=".ui.EquipmentActivity"
+        <activity android:name="info.kurozeropb.alcompanion.ui.EquipmentActivity"
             android:screenOrientation="sensorPortrait"
             tools:ignore="LockedOrientationActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="info.kurozeropb.azurlane.ImageFileProvider"
+            android:authorities="info.kurozeropb.alcompanion.ImageFileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/...main/java/info/kurozeropb/azurlane/API.kt → ...n/java/info/kurozeropb/alcompanion/Api.kt b/...main/java/info/kurozeropb/azurlane/API.kt → ...n/java/info/kurozeropb/alcompanion/Api.kt
@@ -1,6 +1,6 @@
 @file:Suppress("DEPRECATION")
 
-package info.kurozeropb.azurlane
+package info.kurozeropb.alcompanion
 
 import android.content.Context
 import android.content.Intent
@@ -14,23 +14,23 @@ import android.widget.Toast
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.httpGet
 import com.google.gson.Gson
-import info.kurozeropb.azurlane.responses.Response
-import info.kurozeropb.azurlane.responses.ShipResponse
+import info.kurozeropb.alcompanion.responses.Response
+import info.kurozeropb.alcompanion.responses.ShipResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.lang.Exception
 import com.github.kittinunf.result.Result
 import com.google.android.material.snackbar.Snackbar
-import info.kurozeropb.azurlane.responses.AllShipsResponse
-import info.kurozeropb.azurlane.ui.ShipActivity
+import info.kurozeropb.alcompanion.responses.AllShipsResponse
+import info.kurozeropb.alcompanion.ui.ShipActivity
 import kotlinx.android.synthetic.main.content_main.view.*
 import java.io.File
 import java.io.FileOutputStream
 import java.util.*
 import kotlin.concurrent.schedule
 
-object API {
+object Api {
     const val baseUrl = "https://azurlane-api.herokuapp.com/v2"
 
     init {

diff --git a/...main/java/info/kurozeropb/azurlane/App.kt → ...n/java/info/kurozeropb/alcompanion/App.kt b/...main/java/info/kurozeropb/azurlane/App.kt → ...n/java/info/kurozeropb/alcompanion/App.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane
+package info.kurozeropb.alcompanion
 
 import android.content.Context
 import android.content.pm.PackageManager

diff --git a/...ropb/azurlane/adapters/ImageViewHolder.kt → ...b/alcompanion/adapters/ImageViewHolder.kt b/...ropb/azurlane/adapters/ImageViewHolder.kt → ...b/alcompanion/adapters/ImageViewHolder.kt
@@ -1,6 +1,6 @@
 @file:Suppress("DEPRECATION")
 
-package info.kurozeropb.azurlane.adapters
+package info.kurozeropb.alcompanion.adapters
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -15,9 +15,9 @@ import com.google.android.material.snackbar.Snackbar
 import com.hendraanggrian.pikasso.into
 import com.hendraanggrian.pikasso.picasso
 import com.stfalcon.frescoimageviewer.ImageViewer
-import info.kurozeropb.azurlane.*
-import info.kurozeropb.azurlane.helpers.GlideApp
-import info.kurozeropb.azurlane.responses.Skin
+import info.kurozeropb.alcompanion.*
+import info.kurozeropb.alcompanion.helpers.GlideApp
+import info.kurozeropb.alcompanion.responses.Skin
 import kotlinx.android.synthetic.main.overlay.view.*
 import kotlinx.android.synthetic.main.card_skin.view.*
 import org.jetbrains.anko.sdk27.coroutines.onClick
@@ -81,7 +81,7 @@ class ImageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
             }
 
             overlay.btn_save.onClick {
-                API.downloadAndSave(
+                Api.downloadAndSave(
                     skin.title?.toLowerCase(Locale.getDefault())?.replace(" ", "-") ?: "unkown",
                     skin.image ?: "",
                     itemView

diff --git a/.../azurlane/adapters/ShipRecyclerAdapter.kt → ...companion/adapters/ShipRecyclerAdapter.kt b/.../azurlane/adapters/ShipRecyclerAdapter.kt → ...companion/adapters/ShipRecyclerAdapter.kt
@@ -1,12 +1,12 @@
-package info.kurozeropb.azurlane.adapters
+package info.kurozeropb.alcompanion.adapters
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import info.kurozeropb.azurlane.R
-import info.kurozeropb.azurlane.responses.AllShip
-import info.kurozeropb.azurlane.responses.Ships
+import info.kurozeropb.alcompanion.R
+import info.kurozeropb.alcompanion.responses.AllShip
+import info.kurozeropb.alcompanion.responses.Ships
 
 class ShipRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private lateinit var mainView: View

diff --git a/...eropb/azurlane/adapters/ShipViewHolder.kt → ...pb/alcompanion/adapters/ShipViewHolder.kt b/...eropb/azurlane/adapters/ShipViewHolder.kt → ...pb/alcompanion/adapters/ShipViewHolder.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.adapters
+package info.kurozeropb.alcompanion.adapters
 
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
@@ -11,10 +11,10 @@ import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.Target
-import info.kurozeropb.azurlane.API
-import info.kurozeropb.azurlane.R
-import info.kurozeropb.azurlane.helpers.GlideApp
-import info.kurozeropb.azurlane.responses.AllShip
+import info.kurozeropb.alcompanion.Api
+import info.kurozeropb.alcompanion.R
+import info.kurozeropb.alcompanion.helpers.GlideApp
+import info.kurozeropb.alcompanion.responses.AllShip
 import kotlinx.android.synthetic.main.card_ship.view.*
 import org.jetbrains.anko.backgroundColor
 import org.jetbrains.anko.backgroundDrawable
@@ -47,7 +47,7 @@ class ShipViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         itemView.tv_ship_name.text = ship.name ?: "-"
         itemView.cv_ship.onClick {
-            API.searchShip(ship.name ?: "", mainView)
+            Api.searchShip(ship.name ?: "", mainView)
         }
 
         if (ship.rarity != null) {

diff --git a/.../azurlane/adapters/SkinRecyclerAdapter.kt → ...companion/adapters/SkinRecyclerAdapter.kt b/.../azurlane/adapters/SkinRecyclerAdapter.kt → ...companion/adapters/SkinRecyclerAdapter.kt
@@ -1,11 +1,11 @@
-package info.kurozeropb.azurlane.adapters
+package info.kurozeropb.alcompanion.adapters
 
 import android.app.Activity
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import info.kurozeropb.azurlane.R
-import info.kurozeropb.azurlane.responses.Skin
+import info.kurozeropb.alcompanion.R
+import info.kurozeropb.alcompanion.responses.Skin
 
 class SkinRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var images = listOf<Skin>()

diff --git a/...opb/azurlane/adapters/ViewPagerAdapter.kt → .../alcompanion/adapters/ViewPagerAdapter.kt b/...opb/azurlane/adapters/ViewPagerAdapter.kt → .../alcompanion/adapters/ViewPagerAdapter.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.adapters
+package info.kurozeropb.alcompanion.adapters
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager

diff --git a/...ozeropb/azurlane/fragments/GeneralInfo.kt → ...ropb/alcompanion/fragments/GeneralInfo.kt b/...ozeropb/azurlane/fragments/GeneralInfo.kt → ...ropb/alcompanion/fragments/GeneralInfo.kt
@@ -1,6 +1,6 @@
 @file:Suppress("DEPRECATION")
 
-package info.kurozeropb.azurlane.fragments
+package info.kurozeropb.alcompanion.fragments
 
 import android.content.Intent
 import android.graphics.Bitmap
@@ -12,7 +12,6 @@ import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
@@ -21,14 +20,14 @@ import com.google.android.material.snackbar.Snackbar
 import com.hendraanggrian.pikasso.into
 import com.hendraanggrian.pikasso.picasso
 import com.stfalcon.frescoimageviewer.ImageViewer
-import info.kurozeropb.azurlane.API
-import info.kurozeropb.azurlane.App
-import info.kurozeropb.azurlane.R
-import info.kurozeropb.azurlane.adapters.SkinRecyclerAdapter
-import info.kurozeropb.azurlane.adapters.file
-import info.kurozeropb.azurlane.helpers.GlideApp
-import info.kurozeropb.azurlane.helpers.ItemDecoration
-import info.kurozeropb.azurlane.responses.Ship
+import info.kurozeropb.alcompanion.Api
+import info.kurozeropb.alcompanion.App
+import info.kurozeropb.alcompanion.R
+import info.kurozeropb.alcompanion.adapters.SkinRecyclerAdapter
+import info.kurozeropb.alcompanion.adapters.file
+import info.kurozeropb.alcompanion.helpers.GlideApp
+import info.kurozeropb.alcompanion.helpers.ItemDecoration
+import info.kurozeropb.alcompanion.responses.Ship
 import kotlinx.android.synthetic.main.overlay.view.*
 import kotlinx.android.synthetic.main.fragment_tab_general.view.*
 import org.jetbrains.anko.backgroundColor
@@ -102,7 +101,7 @@ class GeneralInfo(val name: String, val ship: Ship) : Fragment() {
                         if (dir.exists().not())
                             dir.mkdirs()
 
-                        file = File(dir, "${ship.skins[0].title?.toLowerCase(Locale.getDefault())?.replace(" ", "-")}.png")
+                        file = File(dir, "share-${ship.skins[0].title?.toLowerCase(Locale.getDefault())?.replace(" ", "-")}.png")
 
                         try {
                             file.createNewFile()
@@ -118,21 +117,15 @@ class GeneralInfo(val name: String, val ship: Ship) : Fragment() {
                         val uri = FileProvider.getUriForFile(view.context, view.context.applicationContext.packageName + ".ImageFileProvider", file)
                         intent.putExtra(Intent.EXTRA_STREAM, uri)
 
-                        val parent = if (activity?.parent != null) {
-                            activity?.parent
-                        } else {
-                            file.delete()
-                            return@onLoaded
-                        }
-                        ActivityCompat.startActivityForResult(parent!!, Intent.createChooser(intent, "Share Image"), App.SHARE_IMAGE, null)
+                        startActivityForResult(Intent.createChooser(intent,"Share Image"), App.SHARE_IMAGE, null)
 
                         file.deleteOnExit()
                     }
                 }
             }
 
             overlay.btn_save.onClick {
-                API.downloadAndSave(
+                Api.downloadAndSave(
                     ship.skins[0].title?.toLowerCase(Locale.getDefault())?.replace(" ", "-") ?: "unkown",
                     ship.skins[0].image ?: "",
                     view

diff --git a/...urozeropb/azurlane/fragments/StatsInfo.kt → ...zeropb/alcompanion/fragments/StatsInfo.kt b/...urozeropb/azurlane/fragments/StatsInfo.kt → ...zeropb/alcompanion/fragments/StatsInfo.kt
@@ -1,11 +1,11 @@
-package info.kurozeropb.azurlane.fragments
+package info.kurozeropb.alcompanion.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import info.kurozeropb.azurlane.R
+import info.kurozeropb.alcompanion.R
 
 class StatsInfo : Fragment() {
 

diff --git a/...o/kurozeropb/azurlane/helpers/GlideApp.kt → ...urozeropb/alcompanion/helpers/GlideApp.kt b/...o/kurozeropb/azurlane/helpers/GlideApp.kt → ...urozeropb/alcompanion/helpers/GlideApp.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.helpers
+package info.kurozeropb.alcompanion.helpers
 
 import android.content.Context
 import com.bumptech.glide.GlideBuilder

diff --git a/...zeropb/azurlane/helpers/ItemDecoration.kt → ...opb/alcompanion/helpers/ItemDecoration.kt b/...zeropb/azurlane/helpers/ItemDecoration.kt → ...opb/alcompanion/helpers/ItemDecoration.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.helpers
+package info.kurozeropb.alcompanion.helpers
 
 import android.graphics.Rect
 import android.view.View

diff --git a/...pb/azurlane/responses/AllShipsResponse.kt → ...alcompanion/responses/AllShipsResponse.kt b/...pb/azurlane/responses/AllShipsResponse.kt → ...alcompanion/responses/AllShipsResponse.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.responses
+package info.kurozeropb.alcompanion.responses
 
 typealias Ships = List<AllShip>
 

diff --git a/...kurozeropb/azurlane/responses/Response.kt → ...ozeropb/alcompanion/responses/Response.kt b/...kurozeropb/azurlane/responses/Response.kt → ...ozeropb/alcompanion/responses/Response.kt
@@ -1,3 +1,3 @@
-package info.kurozeropb.azurlane.responses
+package info.kurozeropb.alcompanion.responses
 
 data class Response<out V : Any?, out E : Exception?>(val value: V, val exception: E)
diff --git a/...zeropb/azurlane/responses/ShipResponse.kt → ...opb/alcompanion/responses/ShipResponse.kt b/...zeropb/azurlane/responses/ShipResponse.kt → ...opb/alcompanion/responses/ShipResponse.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.responses
+package info.kurozeropb.alcompanion.responses
 
 data class Names(
     val en: String? = null,

diff --git a/...rozeropb/azurlane/ui/EquipmentActivity.kt → ...eropb/alcompanion/ui/EquipmentActivity.kt b/...rozeropb/azurlane/ui/EquipmentActivity.kt → ...eropb/alcompanion/ui/EquipmentActivity.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.ui
+package info.kurozeropb.alcompanion.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity

diff --git a/...ropb/azurlane/ui/EquipmentListActivity.kt → ...b/alcompanion/ui/EquipmentListActivity.kt b/...ropb/azurlane/ui/EquipmentListActivity.kt → ...b/alcompanion/ui/EquipmentListActivity.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.ui
+package info.kurozeropb.alcompanion.ui
 
 import android.content.Intent
 import android.os.Bundle
@@ -7,7 +7,7 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.google.android.material.navigation.NavigationView
-import info.kurozeropb.azurlane.R
+import info.kurozeropb.alcompanion.R
 import kotlinx.android.synthetic.main.activity_equipment_list.*
 import kotlinx.android.synthetic.main.app_bar_equipment.*
 

diff --git a/...fo/kurozeropb/azurlane/ui/MainActivity.kt → ...kurozeropb/alcompanion/ui/MainActivity.kt b/...fo/kurozeropb/azurlane/ui/MainActivity.kt → ...kurozeropb/alcompanion/ui/MainActivity.kt
@@ -1,4 +1,4 @@
-package info.kurozeropb.azurlane.ui
+package info.kurozeropb.alcompanion.ui
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -16,11 +16,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.navigation.NavigationView
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import info.kurozeropb.azurlane.API
-import info.kurozeropb.azurlane.App
-import info.kurozeropb.azurlane.R
-import info.kurozeropb.azurlane.adapters.ShipRecyclerAdapter
-import info.kurozeropb.azurlane.responses.Ships
+import info.kurozeropb.alcompanion.Api
+import info.kurozeropb.alcompanion.App
+import info.kurozeropb.alcompanion.R
+import info.kurozeropb.alcompanion.adapters.ShipRecyclerAdapter
+import info.kurozeropb.alcompanion.responses.Ships
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.app_bar_main.*
 import kotlinx.android.synthetic.main.content_main.*
@@ -67,7 +67,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             when (actionId) {
                 EditorInfo.IME_ACTION_SEARCH -> {
                     val name = et_search_bar.text.toString()
-                    API.searchShip(name, contentMain)
+                    Api.searchShip(name, contentMain)
                 }
             }
         }

diff --git a/...urozeropb/azurlane/ui/SettingsActivity.kt → ...zeropb/alcompanion/ui/SettingsActivity.kt b/...urozeropb/azurlane/ui/SettingsActivity.kt → ...zeropb/alcompanion/ui/SettingsActivity.kt
@@ -1,8 +1,8 @@
-package info.kurozeropb.azurlane.ui
+package info.kurozeropb.alcompanion.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import info.kurozeropb.azurlane.R
+import info.kurozeropb.alcompanion.R
 
 class SettingsActivity : AppCompatActivity() {