From d513b0071183a4516d7712e039be54c021255349 Mon Sep 17 00:00:00 2001 From: ChronosX88 Date: Fri, 8 Feb 2019 21:49:44 +0400 Subject: [PATCH] New UI finished, and image showing! --- .idea/caches/gradle_models.ser | Bin 108662 -> 108688 bytes .../volgorobot/vrcatalog/ItemPresenter.java | 28 +++++--- .../additional/ImagePagerAdapter.java | 4 +- .../vrcatalog/view/DetailActivity.java | 68 ++++++++---------- app/src/main/res/layout/activity_detail.xml | 8 ++- build.gradle | 2 +- 6 files changed, 57 insertions(+), 53 deletions(-) diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index a915058cf2bc424ad08ae569d038f68004241919..6fe1fd92dc8a445cc873f37c81c56ff4e4f8dad3 100644 GIT binary patch literal 108688 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 extrasMap = getIntentExtras(intent); + ((TextView) findViewById(R.id.itemName)).setText(intent.getStringExtra("detailName")); + String tmp = intent.getStringExtra("detailPrice"); + if(tmp.equals("0")) { + tmp = "Уточните у продавца"; + } + ((TextView) findViewById(R.id.itemPrice)).setText(tmp); - nameView.setText(extrasMap.get("detailName")); - quantityView.setText(extrasMap.get("detailQuantity")); - priceView.setText(extrasMap.get("detailPrice")); - countryView.setText(extrasMap.get("detailCountry")); - analogueView.setText(extrasMap.get("detailAnalogue")); - datasheetView.setText(extrasMap.get("detailDatasheet")); - notesView.setText(extrasMap.get("detailNotes")); - mPresenter.getImagesByItemID(Integer.parseInt(extrasMap.get("itemID"))); + LinkedHashMap extrasMap = getIntentExtras(intent); + + propertiesList = findViewById(R.id.propertiesList); + PropertiesListAdapter propertiesListAdapter = new PropertiesListAdapter(extrasMap); + propertiesList.setAdapter(propertiesListAdapter); + + mPresenter.getImagesByItemID(Integer.parseInt(intent.getStringExtra("itemID"))); } void initializeViews() { - nameView = findViewById(R.id.name); - quantityView = findViewById(R.id.quantity); - priceView = findViewById(R.id.price); - notesView = findViewById(R.id.notes); - countryView = findViewById(R.id.country); - analogueView = findViewById(R.id.analogue); - datasheetView = findViewById(R.id.datasheet); - datasheetView.setMovementMethod(LinkMovementMethod.getInstance()); viewPager = findViewById(R.id.viewPager); } - HashMap getIntentExtras(Intent intent) { - HashMap hashMap = new HashMap<>(); + LinkedHashMap getIntentExtras(Intent intent) { + LinkedHashMap hashMap = new LinkedHashMap<>(); String tmp; - tmp = intent.getStringExtra("detailName"); - hashMap.put("detailName", tmp); - tmp = intent.getStringExtra("detailQuantity"); if(tmp.equals("0")) { tmp = "Под заказ"; } - hashMap.put("detailQuantity", tmp); - - tmp = intent.getStringExtra("detailPrice"); - if(tmp.equals("0")) { - tmp = "Уточните у продавца"; - } - hashMap.put("detailPrice", tmp); + hashMap.put("Количество", tmp); tmp = intent.getStringExtra("detailCountry"); if(tmp.equals("")) { tmp = "Не указано"; } - hashMap.put("detailCountry", tmp); + hashMap.put("Страна изготовления", tmp); tmp = intent.getStringExtra("detailAnalogue"); if(tmp.equals("")) { tmp = "Нет аналогов"; } - hashMap.put("detailAnalogue", tmp); + hashMap.put("Аналоги", tmp); tmp = intent.getStringExtra("detailDatasheet"); if(!tmp.matches("\\S")) { tmp = "Не указано"; } - hashMap.put("detailDatasheet", tmp); + hashMap.put("Техническая спецификация", tmp); tmp = intent.getStringExtra("detailNotes"); if(tmp != null && tmp.equals("")) { @@ -106,7 +93,7 @@ public class DetailActivity extends AppCompatActivity implements MainContract.It } else if (tmp == null){ tmp = "Нет описания"; } - hashMap.put("detailNotes", tmp); + hashMap.put("Описание", tmp); return hashMap; } @@ -148,4 +135,5 @@ public class DetailActivity extends AppCompatActivity implements MainContract.It viewPager.setAdapter(imagePagerAdapter); imagePagerAdapter.notifyDataSetChanged(); } + } diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml index e4adc21..2fedf75 100644 --- a/app/src/main/res/layout/activity_detail.xml +++ b/app/src/main/res/layout/activity_detail.xml @@ -3,7 +3,7 @@ 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" + android:layout_height="wrap_content" android:orientation="vertical"> - - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 47d59f1..ab22a0a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' // NOTE: Do not place your application dependencies here; they belong