From 15fbca7f638efcbab2541b4ec8c1bf5184050f18 Mon Sep 17 00:00:00 2001
From: Alexandra <a.ermilova@evotor.ru>
Date: Mon, 28 May 2018 14:57:58 +0300
Subject: [PATCH] Make it buildable, add read permission

---
 app/build.gradle                                          | 3 ++-
 app/src/main/AndroidManifest.xml                          | 2 ++
 .../example/shop_commodity/ShopCommodityDetailFragment.kt | 6 +++---
 .../example/shop_commodity/ShopCommodityListActivity.kt   | 8 ++++----
 .../stock_commodity/StockCommodityDetailFragment.kt       | 6 +++---
 .../example/stock_commodity/StockCommodityListActivity.kt | 8 ++++----
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d92d7c5..fc44123 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,8 @@ dependencies {
     implementation 'com.android.support:design:26.1.0'
 
     implementation 'com.android.support:design:26.1.0'
-    implementation 'com.github.evotor:egais-api:38f9fabea9'
+//    implementation 'ru.evotor:egais-api:0.0.121-dev'
+    implementation 'com.github.evotor:egais-api:0.0.1'
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0eaf874..4eecd33 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ru.evotor.egais.api.example">
 
+    <uses-permission android:name="ru.evotor.permission.EGAIS_READ_API" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityDetailFragment.kt b/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityDetailFragment.kt
index 8ca5b6d..400e32c 100644
--- a/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityDetailFragment.kt
+++ b/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityDetailFragment.kt
@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import kotlinx.android.synthetic.main.activity_egais_commodity_detail.*
 import kotlinx.android.synthetic.main.egais_commodity_detail.*
 import ru.evotor.egais.api.example.R
-import ru.evotor.egais.api.model.document.shop_commodity.ShopCommodity
+import ru.evotor.egais.api.model.dictionary.ShopCommodity
 import ru.evotor.egais.api.query.ShopCommodityQuery
 import java.util.*
 
@@ -33,7 +33,7 @@ class ShopCommodityDetailFragment : Fragment(), LoaderManager.LoaderCallbacks<Sh
                         // Load the dummy content specified by the fragment
                         // arguments. In a real-world scenario, use a Loader
                         // to load content from a content provider.
-                        val cursor = ShopCommodityQuery().productInfoAlcCode.equal(it.getString(ARG_ITEM_ID))
+                        val cursor = ShopCommodityQuery().productInfo.alcCode.equal(it.getString(ARG_ITEM_ID))
                                 .execute(context)
                         cursor.moveToFirst()
                         return cursor.getValue()
@@ -68,7 +68,7 @@ class ShopCommodityDetailFragment : Fragment(), LoaderManager.LoaderCallbacks<Sh
     private fun updateData(data: ShopCommodity?) {
         mItem = data
         egais_commodity_detail?.text = mItem?.toString()
-        activity?.toolbar_layout?.title = mItem?.productInfoAlcCode
+        activity?.toolbar_layout?.title = mItem?.productInfo?.alcCode
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
diff --git a/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityListActivity.kt b/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityListActivity.kt
index cc32f58..a3e6e76 100644
--- a/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityListActivity.kt
+++ b/app/src/main/java/ru/evotor/egais/api/example/shop_commodity/ShopCommodityListActivity.kt
@@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.egais_commodity_list.*
 import kotlinx.android.synthetic.main.egais_commodity_list_content.view.*
 import ru.evotor.egais.api.example.R
 import ru.evotor.egais.api.example.stock_commodity.StockCommodityDetailFragment
-import ru.evotor.egais.api.model.document.shop_commodity.ShopCommodity
+import ru.evotor.egais.api.model.dictionary.ShopCommodity
 import ru.evotor.egais.api.query.ShopCommodityQuery
 import ru.evotor.query.Cursor
 
@@ -96,7 +96,7 @@ class ShopCommodityListActivity : AppCompatActivity(), LoaderManager.LoaderCallb
                 if (mTwoPane) {
                     val fragment = StockCommodityDetailFragment().apply {
                         arguments = Bundle().apply {
-                            putString(ShopCommodityDetailFragment.ARG_ITEM_ID, item.productInfoAlcCode)
+                            putString(ShopCommodityDetailFragment.ARG_ITEM_ID, item.productInfo.alcCode)
                         }
                     }
                     mParentActivity.supportFragmentManager
@@ -105,7 +105,7 @@ class ShopCommodityListActivity : AppCompatActivity(), LoaderManager.LoaderCallb
                             .commit()
                 } else {
                     val intent = Intent(v.context, ShopCommodityDetailActivity::class.java).apply {
-                        putExtra(ShopCommodityDetailFragment.ARG_ITEM_ID, item.productInfoAlcCode)
+                        putExtra(ShopCommodityDetailFragment.ARG_ITEM_ID, item.productInfo.alcCode)
                     }
                     v.context.startActivity(intent)
                 }
@@ -121,7 +121,7 @@ class ShopCommodityListActivity : AppCompatActivity(), LoaderManager.LoaderCallb
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             mValues?.moveToPosition(position)
             val item = mValues?.getValue() ?: return
-            holder.mIdView.text = item.productInfoAlcCode
+            holder.mIdView.text = item.productInfo.alcCode
             //holder.mContentView.text = item.productInfoAlcCode + '\n' + item.quantity.toPlainString()
 
             with(holder.itemView) {
diff --git a/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityDetailFragment.kt b/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityDetailFragment.kt
index a46e9a0..1b6f884 100644
--- a/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityDetailFragment.kt
+++ b/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityDetailFragment.kt
@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import kotlinx.android.synthetic.main.activity_egais_commodity_detail.*
 import kotlinx.android.synthetic.main.egais_commodity_detail.*
 import ru.evotor.egais.api.example.R
-import ru.evotor.egais.api.model.document.stock_commodity.StockCommodity
+import ru.evotor.egais.api.model.dictionary.StockCommodity
 import ru.evotor.egais.api.query.StockCommodityQuery
 import java.util.*
 
@@ -33,7 +33,7 @@ class StockCommodityDetailFragment : Fragment(), LoaderManager.LoaderCallbacks<S
                         // Load the dummy content specified by the fragment
                         // arguments. In a real-world scenario, use a Loader
                         // to load content from a content provider.
-                        val cursor = StockCommodityQuery().productInfoAlcCode.equal(it.getString(ARG_ITEM_ID))
+                        val cursor = StockCommodityQuery().productInfo.alcCode.equal(it.getString(ARG_ITEM_ID))
                                 .execute(context)
                         cursor.moveToFirst()
                         return cursor.getValue()
@@ -68,7 +68,7 @@ class StockCommodityDetailFragment : Fragment(), LoaderManager.LoaderCallbacks<S
     private fun updateData(data: StockCommodity?) {
         mItem = data
         egais_commodity_detail?.text = mItem?.toString()
-        activity?.toolbar_layout?.title = mItem?.productInfoAlcCode
+        activity?.toolbar_layout?.title = mItem?.productInfo?.alcCode
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
diff --git a/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityListActivity.kt b/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityListActivity.kt
index a0af2b9..2591d9f 100644
--- a/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityListActivity.kt
+++ b/app/src/main/java/ru/evotor/egais/api/example/stock_commodity/StockCommodityListActivity.kt
@@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_egais_commodity_list.*
 import kotlinx.android.synthetic.main.egais_commodity_list.*
 import kotlinx.android.synthetic.main.egais_commodity_list_content.view.*
 import ru.evotor.egais.api.example.R
-import ru.evotor.egais.api.model.document.stock_commodity.StockCommodity
+import ru.evotor.egais.api.model.dictionary.StockCommodity
 import ru.evotor.egais.api.query.StockCommodityQuery
 import ru.evotor.query.Cursor
 
@@ -95,7 +95,7 @@ class StockCommodityListActivity : AppCompatActivity(), LoaderManager.LoaderCall
                 if (mTwoPane) {
                     val fragment = StockCommodityDetailFragment().apply {
                         arguments = Bundle().apply {
-                            putString(StockCommodityDetailFragment.ARG_ITEM_ID, item.productInfoAlcCode)
+                            putString(StockCommodityDetailFragment.ARG_ITEM_ID, item.productInfo.alcCode)
                         }
                     }
                     mParentActivity.supportFragmentManager
@@ -104,7 +104,7 @@ class StockCommodityListActivity : AppCompatActivity(), LoaderManager.LoaderCall
                             .commit()
                 } else {
                     val intent = Intent(v.context, StockCommodityDetailActivity::class.java).apply {
-                        putExtra(StockCommodityDetailFragment.ARG_ITEM_ID, item.productInfoAlcCode)
+                        putExtra(StockCommodityDetailFragment.ARG_ITEM_ID, item.productInfo.alcCode)
                     }
                     v.context.startActivity(intent)
                 }
@@ -120,7 +120,7 @@ class StockCommodityListActivity : AppCompatActivity(), LoaderManager.LoaderCall
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             mValues?.moveToPosition(position)
             val item = mValues?.getValue() ?: return
-            holder.mIdView.text = item.productInfoAlcCode
+            holder.mIdView.text = item.productInfo.alcCode
             //holder.mContentView.text = item.productInfoAlcCode + '\n' + item.quantity.toPlainString()
 
             with(holder.itemView) {