diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 0000000..bdbdf89 --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml new file mode 100644 index 0000000..57927c5 --- /dev/null +++ b/.idea/markdown-navigator/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 821cf50..7bfef59 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,33 +1,9 @@ - - - + + + + + - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 7bd318a..00a4914 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt b/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt index 86a239d..59666d4 100644 --- a/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt +++ b/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt @@ -2,12 +2,14 @@ package com.mazenrashed.universalbluetoothprinter import android.app.Activity import android.content.Intent -import android.support.v7.app.AppCompatActivity import android.os.Bundle +import android.support.v7.app.AppCompatActivity import com.mazenrashed.universalbluethootprinter.Printooth import com.mazenrashed.universalbluethootprinter.data.DefaultPrinter import com.mazenrashed.universalbluethootprinter.data.Printable import com.mazenrashed.universalbluethootprinter.ui.ScanningActivity +import kotlinx.android.synthetic.main.activity_main.btnPiarUnpair +import kotlinx.android.synthetic.main.activity_main.btnPrint class MainActivity : AppCompatActivity() { @@ -15,26 +17,25 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - print.setOnClickListener { - if (!Printooth.hasPairedPrinter()) - startActivityForResult(Intent(this, ScanningActivity::class.java), ScanningActivity.SCANNING_FOR_PRINTER) - else - printSomePrintables() + btnPrint.setOnClickListener { + if (!Printooth.hasPairedPrinter()) startActivityForResult(Intent(this, + ScanningActivity::class.java), + ScanningActivity.SCANNING_FOR_PRINTER) + else printSomePrintable() } - piarUnpair.text = if (Printooth.hasPairedPrinter()) "Unpair ${Printooth.getPairedPrinter()?.name}" else "Pair with printer" + btnPiarUnpair.text = if (Printooth.hasPairedPrinter()) "Unpair ${Printooth.getPairedPrinter()?.name}" else "Pair with printer" - piarUnpair.setOnClickListener { - if (Printooth.hasPairedPrinter()) - Printooth.removeCurrentPrinter() - else - startActivityForResult(Intent(this, ScanningActivity::class.java), ScanningActivity.SCANNING_FOR_PRINTER) + btnPiarUnpair.setOnClickListener { + if (Printooth.hasPairedPrinter()) Printooth.removeCurrentPrinter() + else startActivityForResult(Intent(this, ScanningActivity::class.java), + ScanningActivity.SCANNING_FOR_PRINTER) } } - private fun printSomePrintables() { - var printables = ArrayList() - printables.add( + private fun printSomePrintable() { + val printable = ArrayList() + printable.add( Printable.PrintableBuilder() .setText("Hello World") .setLineSpacing(DefaultPrinter.LINE_SPACING_60) @@ -46,7 +47,7 @@ class MainActivity : AppCompatActivity() { .setNewLinesAfter(1) .build() ) - printables.add( + printable.add( Printable.PrintableBuilder() .setText("Hello World") .setAlignment(DefaultPrinter.ALLIGMENT_LEFT) @@ -57,7 +58,7 @@ class MainActivity : AppCompatActivity() { .setNewLinesAfter(1) .build() ) - printables.add( + printable.add( Printable.PrintableBuilder() .setText("Hello World") .setAlignment(DefaultPrinter.ALLIGMENT_REGHT) @@ -68,7 +69,7 @@ class MainActivity : AppCompatActivity() { .setNewLinesAfter(1) .build() ) - printables.add( + printable.add( Printable.PrintableBuilder() .setText("اختبار العربية") .setAlignment(DefaultPrinter.ALLIGMENT_CENTER) @@ -80,7 +81,7 @@ class MainActivity : AppCompatActivity() { .build() ) - Printooth.printer(this).print(printables) + Printooth.printer(this).print(printable) } @@ -88,6 +89,6 @@ class MainActivity : AppCompatActivity() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) if (requestCode == ScanningActivity.SCANNING_FOR_PRINTER && resultCode == Activity.RESULT_OK) - printSomePrintables() + printSomePrintable() } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7cc2998..8a96683 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,28 +1,27 @@ - -