Merge pull request #1 from you96m/master

Fix project config's.
mazenrashed · Oct 23, 2018 · 214e4cf · 214e4cf
2 parents 101c5e4 + 92f0255
commit 214e4cf
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 61 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt b/app/src/main/java/com/mazenrashed/universalbluetoothprinter/MainActivity.kt
@@ -2,39 +2,40 @@ 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() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         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<Printable>()
-        printables.add(
+    private fun printSomePrintable() {
+        val printable = ArrayList<Printable>()
+        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,14 +81,14 @@ class MainActivity : AppCompatActivity() {
                         .build()
         )
 
-        Printooth.printer(this).print(printables)
+        Printooth.printer(this).print(printable)
 
 
     }
 
     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
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <Button
+    <android.support.v7.widget.AppCompatButton
+        android:id="@+id/btnPrint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:text="Print Hello World"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:text="Print Hello World"
-        android:id="@+id/print"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <android.support.v7.widget.AppCompatButton
+        android:id="@+id/btnPiarUnpair"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/piarUnpair"
-        app:layout_constraintTop_toBottomOf="@id/print"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btnPrint" />
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>