Merge pull request #4 from hishoot2i/wip_modular

v1.2.4

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 -----
+### **v1.2.4 (20180817)**
+- Handle device without external storage
+- [Badge] preview font at choice
+- Bug fixes and some improvements
+
 ### **v1.2.3 (20180806)**
 - Bug fixes
 

VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

app/build.gradle

@@ -83,8 +83,12 @@ kapt { useBuildCache = true }
 
 dependencies {
     implementation project(':common')
+    implementation project(':entity')
+    implementation project(':imageloader')
     implementation project(':template')
 
+    implementation deps.universalImageLoader
+
     implementation deps.kotlin.stdlib
 
     implementation deps.supportLibrary.annotations

app/src/debug/java/org/illegaller/ratabb/hishoot2i/DebugApp.kt

@@ -25,7 +25,6 @@ class DebugApp : App() {
         StrictMode.setThreadPolicy(
             StrictMode.ThreadPolicy.Builder()
                 .detectAll()
-                // .permitDiskReads() // FIXME: SharedPreference [Editor] get/set Value?
                 .penaltyLog()
                 .build()
         )

app/src/main/AndroidManifest.xml

@@ -6,11 +6,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <!-- TODO: -->
-    <!--
-     <uses-permission android:name="android.permission.INTERNET" />
-     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-     -->
 
     <application
         android:name=".App"
@@ -23,7 +18,7 @@
         android:supportsRtl="false"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
-        <!-- android:largeHeap="true" Ouch! -->
+        <!-- NOTE: -->
         <!-- GoogleAppIndexingWarning: IDK -->
         <!-- UnusedAttribute:  android:appCategory="image" Api26+ -->
         <activity
@@ -36,6 +31,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
+                <!-- NOTE: Explicit here, cause category launcher using ALIAS  -->
                 <action android:name="cat.ereza.customactivityoncrash.RESTART" />
             </intent-filter>
         </activity>

app/src/main/java/org/illegaller/ratabb/hishoot2i/App.kt

@@ -5,17 +5,12 @@ import com.squareup.leakcanary.LeakCanary
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
 
-/**/
 @SuppressLint("Registered") //
 open class App : DaggerApplication() {
     override fun onCreate() {
         super.onCreate()
 
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return
-        }
+        if (LeakCanary.isInAnalyzerProcess(this)) return
         installLeakCanary()
     }
 

app/src/main/java/org/illegaller/ratabb/hishoot2i/data/DataModule.kt

@@ -2,20 +2,16 @@ package org.illegaller.ratabb.hishoot2i.data
 
 import android.content.Context
 import com.chibatching.kotpref.Kotpref
+import common.FileConstants
+import common.egl.MaxTexture
+import common.egl.MaxTextureCompat
 import dagger.Module
 import dagger.Provides
 import org.illegaller.ratabb.hishoot2i.data.core.CoreProcess
 import org.illegaller.ratabb.hishoot2i.data.core.CoreProcessImpl
 import org.illegaller.ratabb.hishoot2i.data.pref.AppPref
 import org.illegaller.ratabb.hishoot2i.data.rx.AppScheduler
 import org.illegaller.ratabb.hishoot2i.data.rx.SchedulerProvider
-import rbb.hishoot2i.common.FileConstants
-import rbb.hishoot2i.common.egl.MaxTexture
-import rbb.hishoot2i.common.egl.MaxTextureCompat
-import rbb.hishoot2i.common.imageloader.ImageLoader
-import rbb.hishoot2i.common.imageloader.uil.UilImageLoaderImpl
-import rbb.hishoot2i.template.TemplateFactoryManager
-import rbb.hishoot2i.template.TemplateFactoryManagerImpl
 import javax.inject.Singleton
 
 @Module
@@ -46,13 +42,16 @@ object DataModule {
     @Provides
     @Singleton
     @JvmStatic
-    fun provideImageLoader(context: Context): ImageLoader =
-        UilImageLoaderImpl(context, /*BuildConfig.DEBUG*/ false)
+    fun provideImageLoader(
+        impl: imageloader.uil.UilImageLoaderImpl
+    ): imageloader.ImageLoader = impl
 
     @Provides
     @Singleton
     @JvmStatic
-    fun provideFactoryManager(impl: TemplateFactoryManagerImpl): TemplateFactoryManager = impl
+    fun provideFactoryManager(
+        impl: template.TemplateFactoryManagerImpl
+    ): template.TemplateFactoryManager = impl
 
     @Provides
     @Singleton

app/src/main/java/org/illegaller/ratabb/hishoot2i/data/FileConstantsImpl.kt

@@ -3,52 +3,43 @@ package org.illegaller.ratabb.hishoot2i.data
 import android.content.Context
 import android.net.Uri
 import android.os.Environment
-import android.support.v4.content.FileProvider
-import org.illegaller.ratabb.hishoot2i.BuildConfig
-import rbb.hishoot2i.common.FileConstants
+import android.support.v4.content.FileProvider.getUriForFile
+import org.illegaller.ratabb.hishoot2i.BuildConfig.FILE_AUTHORITY
 import java.io.File
 import java.io.IOException
 import javax.inject.Inject
 
-class FileConstantsImpl @Inject constructor(val context: Context) : FileConstants {
-    private var saved: File? = null
-    private var htz: File? = null
-    private var bgCrop: File? = null
+class FileConstantsImpl @Inject constructor(val context: Context) : common.FileConstants {
     override fun savedDir(): File {
-        saved?.let { return it }
-        val result = File(Environment.getExternalStorageDirectory(), "HiShoot")
-        if (!result.exists()) {
-            result.mkdirs()
+        val parent = Environment.getExternalStorageState().let { state ->
+            when (state) {
+                Environment.MEDIA_MOUNTED -> Environment.getExternalStorageDirectory()
+                else -> context.getExternalFilesDir(null)
+            }.let { if (!it.canWrite()) context.filesDir else it }
         }
-        saved = result
+        val result = File(parent, "HiShoot")
+        if (!result.exists()) result.mkdirs()
         return result
     }
 
     override fun htzDir(): File {
-        htz?.let { return it }
         val result = File(context.filesDir, "htz")
-        if (!result.exists()) {
-            result.mkdirs()
-        }
+        if (!result.exists()) result.mkdirs()
         try {
-            File(result, FileConstants.NO_MEDIA).createNewFile()
-        } catch (e: IOException) {
-            e.printStackTrace()
+            File(result, common.FileConstants.NO_MEDIA).createNewFile()
+        } catch (ignore: IOException) {
         }
-        htz = result
         return result
     }
 
-    override fun File.toUri(): Uri =
-        FileProvider.getUriForFile(context, BuildConfig.FILE_AUTHORITY, this)
-
+    override fun File.toUri(): Uri = getUriForFile(context, FILE_AUTHORITY, this)
     override fun bgCrop(): File {
-        bgCrop?.let { return it }
-        val result =
-            File(context.cacheDir, FileConstants.BG_CROP)
+        val result = File(context.cacheDir, common.FileConstants.BG_CROP)
         if (result.exists()) result.delete()
-        result.createNewFile()
-        bgCrop = result
+        try {
+            result.createNewFile()
+        } catch (e: IOException) {
+        }
         return result
     }
 }

app/src/main/java/org/illegaller/ratabb/hishoot2i/data/FileFontStorageSourceImpl.kt

@@ -5,6 +5,7 @@ import io.reactivex.rxkotlin.mergeDelayError
 import io.reactivex.rxkotlin.toFlowable
 import org.illegaller.ratabb.hishoot2i.data.pref.AppPref
 import java.io.File
+import java.text.Collator
 import javax.inject.Inject
 import android.os.Environment.getExternalStorageDirectory as ExternalStorageDir
 
@@ -17,13 +18,12 @@ class FileFontStorageSourceImpl @Inject constructor(val appPref: AppPref) : File
         .asIterable()
         .mergeDelayError()
         .filter { it.canRead() && it.isDirectory }
-        .flatMap { dir: File ->
-            dir.listFiles { file: File? ->
-                SUPPORT_FONT_EXT.contains(file?.extension)
-            }.toFlowable()
+        .flatMap {
+            it.listFiles { file: File? -> SUPPORT_FONT_EXT.contains(file?.extension) }
+                .toFlowable()
         }
         .distinct { it.nameWithoutExtension } //
-        .sorted { lhs: File, rhs: File -> lhs.name.compareTo(rhs.name, true) }
+        .sorted(::sortFileByNames)
 
     private fun defaultFontDir(): Flowable<File> = DEFAULT_FONT_PATH.toFlowable()
         .flatMap { path: String -> Flowable.fromCallable { File(ExternalStorageDir(), path) } }
@@ -32,14 +32,16 @@ class FileFontStorageSourceImpl @Inject constructor(val appPref: AppPref) : File
         Flowable.fromCallable { File(path) }
     } ?: Flowable.empty()
 
-    private fun systemFontDir(): Flowable<File> = when (appPref.systemFontEnable) {
-        true -> Flowable.fromCallable { File(SYSTEM_FONT_PATH) }
-        false -> Flowable.empty()
-    }
+    private fun systemFontDir(): Flowable<File> = if (appPref.systemFontEnable) {
+        Flowable.fromCallable { File(SYSTEM_FONT_PATH) }
+    } else Flowable.empty()
+
+    private fun sortFileByNames(lhs: File, rhs: File): Int = collator.compare(lhs.name, rhs.name)
 
     companion object {
         private const val SYSTEM_FONT_PATH = "/system/fonts" //
         private val DEFAULT_FONT_PATH = arrayOf("font", "fonts")
         private val SUPPORT_FONT_EXT = arrayOf("ttf", "otf")
+        private val collator = Collator.getInstance()
     }
 }

app/src/main/java/org/illegaller/ratabb/hishoot2i/data/PackageResolver.kt

@@ -1,12 +1,8 @@
 package org.illegaller.ratabb.hishoot2i.data
 
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
-import android.content.pm.ResolveInfo
 import io.reactivex.Flowable
 
 interface PackageResolver {
-    fun queryIntentActivities(category: String): Flowable<ResolveInfo>
-    fun installedApplications(): Flowable<ApplicationInfo>
-    fun getPackageInfo(packageName: String): PackageInfo
+    fun installedTemplateLegacy(): Flowable<entity.AppInfo>
+    fun installedTemplate(version: Int): Flowable<entity.AppInfo>
 }