diff --git a/app/build.gradle b/app/build.gradle index c7a98e4..d45c4f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,6 +4,8 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' + android { compileSdkVersion 28 defaultConfig { diff --git a/app/src/main/java/com/mazenrashed/universalbluetoothprinter/ApplicationClass.kt b/app/src/main/java/com/mazenrashed/universalbluetoothprinter/ApplicationClass.kt index 275f8ed..5ded65b 100644 --- a/app/src/main/java/com/mazenrashed/universalbluetoothprinter/ApplicationClass.kt +++ b/app/src/main/java/com/mazenrashed/universalbluetoothprinter/ApplicationClass.kt @@ -1,12 +1,12 @@ package com.mazenrashed.universalbluetoothprinter import android.app.Application -import com.mazenrashed.universalbluethootprinter.BluetoothPrinter +import com.mazenrashed.universalbluethootprinter.Printooth class ApplicationClass : Application(){ override fun onCreate() { super.onCreate() - BluetoothPrinter.init(this) + Printooth.init(this) } } \ No newline at end of file diff --git a/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt b/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt index d8881ff..86a239d 100644 --- a/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt +++ b/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt @@ -4,12 +4,10 @@ import android.app.Activity import android.content.Intent import android.support.v7.app.AppCompatActivity import android.os.Bundle -import com.mazenrashed.universalbluethootprinter.BluetoothPrinter +import com.mazenrashed.universalbluethootprinter.Printooth import com.mazenrashed.universalbluethootprinter.data.DefaultPrinter -import com.mazenrashed.universalbluethootprinter.data.PairedPrinter import com.mazenrashed.universalbluethootprinter.data.Printable import com.mazenrashed.universalbluethootprinter.ui.ScanningActivity -import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { @@ -18,17 +16,17 @@ class MainActivity : AppCompatActivity() { setContentView(R.layout.activity_main) print.setOnClickListener { - if (!BluetoothPrinter.hasPairedPrinter()) + if (!Printooth.hasPairedPrinter()) startActivityForResult(Intent(this, ScanningActivity::class.java), ScanningActivity.SCANNING_FOR_PRINTER) else printSomePrintables() } - piarUnpair.text = if (BluetoothPrinter.hasPairedPrinter()) "Unpair ${BluetoothPrinter.getPairedPrinter()?.name}" else "Pair with printer" + piarUnpair.text = if (Printooth.hasPairedPrinter()) "Unpair ${Printooth.getPairedPrinter()?.name}" else "Pair with printer" piarUnpair.setOnClickListener { - if (BluetoothPrinter.hasPairedPrinter()) - BluetoothPrinter.removeCurrentPrinter() + if (Printooth.hasPairedPrinter()) + Printooth.removeCurrentPrinter() else startActivityForResult(Intent(this, ScanningActivity::class.java), ScanningActivity.SCANNING_FOR_PRINTER) } @@ -82,7 +80,7 @@ class MainActivity : AppCompatActivity() { .build() ) - BluetoothPrinter.printer(this).print(printables) + Printooth.printer(this).print(printables) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b3dd84f..7cc2998 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index a3176b9..f2bdcfc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.2.60' repositories { google() + mavenCentral() jcenter() } dependencies { @@ -18,6 +19,7 @@ buildscript { allprojects { repositories { google() + mavenCentral() jcenter() } } diff --git a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/BluetoothPrinter.kt b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/Printooth.kt similarity index 98% rename from universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/BluetoothPrinter.kt rename to universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/Printooth.kt index 6576c8c..0463f61 100644 --- a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/BluetoothPrinter.kt +++ b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/Printooth.kt @@ -7,7 +7,7 @@ import com.mazenrashed.universalbluethootprinter.data.Printer import com.mazenrashed.universalbluethootprinter.utilities.Printing import io.paperdb.Paper -object BluetoothPrinter { +object Printooth { fun init(context: Context) = Paper.init(context) diff --git a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/ui/ScanningActivity.kt b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/ui/ScanningActivity.kt index 0dab5d1..f4118d2 100644 --- a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/ui/ScanningActivity.kt +++ b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/ui/ScanningActivity.kt @@ -17,7 +17,7 @@ import android.widget.Toast import kotlinx.android.synthetic.main.activity_scanning.* import com.mazenrashed.universalbluethootprinter.data.DiscoveryCallback import com.mazenrashed.universalbluethootprinter.utilities.Bluetooth -import com.mazenrashed.universalbluethootprinter.BluetoothPrinter +import com.mazenrashed.universalbluethootprinter.Printooth import com.mazenrashed.universalbluethootprinter.R class ScanningActivity : AppCompatActivity() { @@ -62,7 +62,7 @@ class ScanningActivity : AppCompatActivity() { } override fun onDevicePaired(device: BluetoothDevice) { - BluetoothPrinter.setPrinter(device.name, device.address) + Printooth.setPrinter(device.name, device.address) Toast.makeText(this@ScanningActivity, "Device Paired", Toast.LENGTH_SHORT).show() adapter.notifyDataSetChanged() setResult(Activity.RESULT_OK) @@ -71,9 +71,9 @@ class ScanningActivity : AppCompatActivity() { override fun onDeviceUnpaired(device: BluetoothDevice) { Toast.makeText(this@ScanningActivity, "Device unpaired", Toast.LENGTH_SHORT).show() - var pairedPrinter = BluetoothPrinter.getPairedPrinter() + var pairedPrinter = Printooth.getPairedPrinter() if (pairedPrinter != null && pairedPrinter.address == device.address) - BluetoothPrinter.removeCurrentPrinter() + Printooth.removeCurrentPrinter() devices.remove(device) adapter.notifyDataSetChanged() bluetooth.startScanning() @@ -91,7 +91,7 @@ class ScanningActivity : AppCompatActivity() { printers.setOnItemClickListener { _, _, i, _ -> var device = devices[i] if (device.bondState == BluetoothDevice.BOND_BONDED) { - BluetoothPrinter.setPrinter(device.name, device.address) + Printooth.setPrinter(device.name, device.address) setResult(Activity.RESULT_OK) this@ScanningActivity.finish() } @@ -139,7 +139,7 @@ class ScanningActivity : AppCompatActivity() { BluetoothDevice.BOND_BONDING -> "Pairing.." else -> "" } - findViewById(R.id.pairedPrinter).visibility = if (BluetoothPrinter.getPairedPrinter()?.address == devices[position].address) View.VISIBLE else View.GONE + findViewById(R.id.pairedPrinter).visibility = if (Printooth.getPairedPrinter()?.address == devices[position].address) View.VISIBLE else View.GONE } } } diff --git a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/ImageUtils.kt b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/ImageUtils.kt index 1b3efcb..1359b1c 100644 --- a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/ImageUtils.kt +++ b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/ImageUtils.kt @@ -1,3 +1,5 @@ +@file:Suppress("NAME_SHADOWING") + package com.mazenrashed.universalbluethootprinter.utilities import android.graphics.Bitmap diff --git a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/StringUtils.kt b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/StringUtils.kt index 1a48647..6b17656 100644 --- a/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/StringUtils.kt +++ b/universalbluethootprinting/src/main/java/com/mazenrashed/universalbluethootprinter/utilities/StringUtils.kt @@ -1,3 +1,5 @@ +@file:Suppress("NAME_SHADOWING") + package com.mazenrashed.universalbluethootprinter.utilities object StringUtils {