appending .pro to package name

.gitignore

@@ -1,4 +1,5 @@
 *.iml
+*.aab
 .gradle
 /local.properties
 /gradle.properties
@@ -6,5 +7,5 @@
 .DS_Store
 /build
 /captures
-release.keystore
+keystore.jks
 signing.properties

app/build.gradle

@@ -7,7 +7,7 @@ android {
     buildToolsVersion "28.0.3"
 
     defaultConfig {
-        applicationId "com.simplemobiletools.draw"
+        applicationId "com.simplemobiletools.draw.pro"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 41

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.simplemobiletools.draw"
+    package="com.simplemobiletools.draw.pro"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

app/src/main/kotlin/com/simplemobiletools/draw/pro/App.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw
+package com.simplemobiletools.draw.pro
 
 import android.app.Application
 import com.simplemobiletools.commons.extensions.checkUseEnglish

app/src/main/kotlin/com/simplemobiletools/draw/pro/actions/Action.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.actions
+package com.simplemobiletools.draw.pro.actions
 
 import android.graphics.Path
 import java.io.Serializable

app/src/main/kotlin/com/simplemobiletools/draw/pro/actions/Line.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.actions
+package com.simplemobiletools.draw.pro.actions
 
 import android.graphics.Path
 import java.io.Writer

app/src/main/kotlin/com/simplemobiletools/draw/pro/actions/Move.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.actions
+package com.simplemobiletools.draw.pro.actions
 
 import android.graphics.Path
 import java.io.Writer

app/src/main/kotlin/com/simplemobiletools/draw/pro/actions/Quad.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.actions
+package com.simplemobiletools.draw.pro.actions
 
 import android.graphics.Path
 import java.io.Writer

app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.activities
+package com.simplemobiletools.draw.pro.activities
 
 import android.app.Activity
 import android.content.Intent
@@ -16,22 +16,21 @@ import android.webkit.MimeTypeMap
 import android.widget.SeekBar
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
-import com.simplemobiletools.commons.dialogs.UpgradeToProDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.LICENSE_GLIDE
 import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.commons.models.FAQItem
 import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.models.Release
-import com.simplemobiletools.draw.BuildConfig
+import com.simplemobiletools.draw.pro.BuildConfig
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.pro.R
-import com.simplemobiletools.draw.dialogs.SaveImageDialog
+import com.simplemobiletools.draw.pro.dialogs.SaveImageDialog
-import com.simplemobiletools.draw.extensions.config
+import com.simplemobiletools.draw.pro.extensions.config
-import com.simplemobiletools.draw.helpers.JPG
+import com.simplemobiletools.draw.pro.helpers.JPG
-import com.simplemobiletools.draw.helpers.PNG
+import com.simplemobiletools.draw.pro.helpers.PNG
-import com.simplemobiletools.draw.helpers.SVG
+import com.simplemobiletools.draw.pro.helpers.SVG
-import com.simplemobiletools.draw.interfaces.CanvasListener
+import com.simplemobiletools.draw.pro.interfaces.CanvasListener
-import com.simplemobiletools.draw.models.Svg
+import com.simplemobiletools.draw.pro.models.Svg
 import kotlinx.android.synthetic.main.activity_main.*
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -77,11 +76,6 @@ class MainActivity : SimpleActivity(), CanvasListener {
         if (!isImageCaptureIntent) {
             checkWhatsNewDialog()
         }
-
-        if (!config.wasInitialUpgradeToProShown) {
-            UpgradeToProDialog(this)
-            config.wasInitialUpgradeToProShown = true
-        }
     }
 
     override fun onResume() {

app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/SettingsActivity.kt

@@ -1,9 +1,10 @@
-package com.simplemobiletools.draw.activities
+package com.simplemobiletools.draw.pro.activities
 
 import android.os.Bundle
-import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.extensions.beVisibleIf
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.commons.extensions.updateTextColors
-import com.simplemobiletools.draw.extensions.config
+import com.simplemobiletools.draw.pro.R
+import com.simplemobiletools.draw.pro.extensions.config
 import kotlinx.android.synthetic.main.activity_settings.*
 import java.util.*
 
@@ -16,7 +17,6 @@ class SettingsActivity : SimpleActivity() {
     override fun onResume() {
         super.onResume()
 
-        setupUpgradeToPro()
         setupCustomizeColors()
         setupUseEnglish()
         setupPreventPhoneFromSleeping()
@@ -26,13 +26,6 @@ class SettingsActivity : SimpleActivity() {
         updateTextColors(settings_holder)
     }
 
-    private fun setupUpgradeToPro() {
-        settings_upgrade_to_pro_holder.beGoneIf(isAProApp())
-        settings_upgrade_to_pro_holder.setOnClickListener {
-            launchUpgradeToProIntent()
-        }
-    }
-
     private fun setupCustomizeColors() {
         settings_customize_colors_holder.setOnClickListener {
             startCustomizationActivity()

app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/SimpleActivity.kt

@@ -1,7 +1,7 @@
-package com.simplemobiletools.draw.activities
+package com.simplemobiletools.draw.pro.activities
 
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.pro.R
 
 open class SimpleActivity : BaseSimpleActivity() {
     override fun getAppIconIDs() = arrayListOf(

app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/SplashActivity.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.activities
+package com.simplemobiletools.draw.pro.activities
 
 import android.content.Intent
 import com.simplemobiletools.commons.activities.BaseSplashActivity

app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt

@@ -1,14 +1,14 @@
-package com.simplemobiletools.draw.dialogs
+package com.simplemobiletools.draw.pro.dialogs
 
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.pro.R
-import com.simplemobiletools.draw.activities.SimpleActivity
+import com.simplemobiletools.draw.pro.activities.SimpleActivity
-import com.simplemobiletools.draw.helpers.JPG
+import com.simplemobiletools.draw.pro.helpers.JPG
-import com.simplemobiletools.draw.helpers.PNG
+import com.simplemobiletools.draw.pro.helpers.PNG
-import com.simplemobiletools.draw.helpers.SVG
+import com.simplemobiletools.draw.pro.helpers.SVG
 import kotlinx.android.synthetic.main.dialog_save_image.view.*
 
 class SaveImageDialog(val activity: SimpleActivity, val defaultExtension: String, val defaultPath: String, val defaultFilename: String,

app/src/main/kotlin/com/simplemobiletools/draw/pro/extensions/Context.kt

@@ -1,6 +1,6 @@
-package com.simplemobiletools.draw.extensions
+package com.simplemobiletools.draw.pro.extensions
 
 import android.content.Context
-import com.simplemobiletools.draw.helpers.Config
+import com.simplemobiletools.draw.pro.helpers.Config
 
 val Context.config: Config get() = Config.newInstance(applicationContext)

app/src/main/kotlin/com/simplemobiletools/draw/pro/helpers/Config.kt

@@ -1,9 +1,9 @@
-package com.simplemobiletools.draw.helpers
+package com.simplemobiletools.draw.pro.helpers
 
 import android.content.Context
 import android.graphics.Color
 import com.simplemobiletools.commons.helpers.BaseConfig
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.pro.R
 
 class Config(context: Context) : BaseConfig(context) {
     companion object {

app/src/main/kotlin/com/simplemobiletools/draw/pro/helpers/Constants.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.helpers
+package com.simplemobiletools.draw.pro.helpers
 
 const val BRUSH_COLOR = "brush_color"
 const val CANVAS_BACKGROUND_COLOR = "canvas_background_color"

app/src/main/kotlin/com/simplemobiletools/draw/pro/interfaces/CanvasListener.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.interfaces
+package com.simplemobiletools.draw.pro.interfaces
 
 interface CanvasListener {
     fun toggleUndoVisibility(visible: Boolean)

app/src/main/kotlin/com/simplemobiletools/draw/pro/models/MyParcelable.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.models
+package com.simplemobiletools.draw.pro.models
 
 import android.os.Parcel
 import android.os.Parcelable

app/src/main/kotlin/com/simplemobiletools/draw/pro/models/MyPath.kt

@@ -1,13 +1,13 @@
-package com.simplemobiletools.draw.models
+package com.simplemobiletools.draw.pro.models
 
 import android.app.Activity
 import android.graphics.Path
 import com.simplemobiletools.commons.extensions.toast
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.pro.R
-import com.simplemobiletools.draw.actions.Action
+import com.simplemobiletools.draw.pro.actions.Action
-import com.simplemobiletools.draw.actions.Line
+import com.simplemobiletools.draw.pro.actions.Line
-import com.simplemobiletools.draw.actions.Move
+import com.simplemobiletools.draw.pro.actions.Move
-import com.simplemobiletools.draw.actions.Quad
+import com.simplemobiletools.draw.pro.actions.Quad
 import java.io.ObjectInputStream
 import java.io.Serializable
 import java.security.InvalidParameterException

app/src/main/kotlin/com/simplemobiletools/draw/pro/models/PaintOptions.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.models
+package com.simplemobiletools.draw.pro.models
 
 import android.graphics.Color
 

app/src/main/kotlin/com/simplemobiletools/draw/pro/models/Svg.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.models
+package com.simplemobiletools.draw.pro.models
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
@@ -9,10 +9,10 @@ import com.simplemobiletools.commons.extensions.getFileOutputStream
 import com.simplemobiletools.commons.extensions.getFilenameFromPath
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.models.FileDirItem
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.pro.R
-import com.simplemobiletools.draw.activities.MainActivity
+import com.simplemobiletools.draw.pro.activities.MainActivity
-import com.simplemobiletools.draw.activities.SimpleActivity
+import com.simplemobiletools.draw.pro.activities.SimpleActivity
-import com.simplemobiletools.draw.views.MyCanvas
+import com.simplemobiletools.draw.pro.views.MyCanvas
 import java.io.*
 import java.util.*
 

app/src/main/kotlin/com/simplemobiletools/draw/pro/views/MyCanvas.kt

@@ -1,4 +1,4 @@
-package com.simplemobiletools.draw.views
+package com.simplemobiletools.draw.pro.views
 
 import android.app.Activity
 import android.content.Context
@@ -12,11 +12,11 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DecodeFormat
 import com.bumptech.glide.request.RequestOptions
 import com.simplemobiletools.commons.extensions.toast
-import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.pro.R
-import com.simplemobiletools.draw.interfaces.CanvasListener
+import com.simplemobiletools.draw.pro.interfaces.CanvasListener
-import com.simplemobiletools.draw.models.MyParcelable
+import com.simplemobiletools.draw.pro.models.MyParcelable
-import com.simplemobiletools.draw.models.MyPath
+import com.simplemobiletools.draw.pro.models.MyPath
-import com.simplemobiletools.draw.models.PaintOptions
+import com.simplemobiletools.draw.pro.models.PaintOptions
 import java.util.*
 import java.util.concurrent.ExecutionException
 

app/src/main/res/layout/activity_main.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplemobiletools.draw.views.MyCanvas
+    <com.simplemobiletools.draw.pro.views.MyCanvas
         android:id="@+id/my_canvas"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_settings.xml

@@ -12,28 +12,6 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/settings_upgrade_to_pro_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
-            android:paddingBottom="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_upgrade_to_pro"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/upgrade_to_pro"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_customize_colors_holder"
             android:layout_width="match_parent"