From dcc0159144c9b6c43bcddfdfb8e8006ca358063e Mon Sep 17 00:00:00 2001 From: sanyud24 <57134307+sanyud24@users.noreply.github.com> Date: Thu, 3 Sep 2020 20:14:21 +0530 Subject: [PATCH 1/9] Update PublicRestaurantProfileActivity.kt textview rating color changes on the basis of rating --- .../PublicRestaurantProfileActivity.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt index c902eedf..4633f659 100644 --- a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt +++ b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt @@ -393,6 +393,22 @@ class PublicRestaurantProfileActivity : BaseActivity(), AppBarLayout.OnOffsetCha } else "-" } ?: "-" tvRating.text = restaurantModel.formatRating() + val ratingtext: String = tvRating.text.toString(); + val ratenumber: Float = ratingtext.toFloat() + if(ratenumber in 4.0..5.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_green_400)); + + } + if(ratenumber in 3.0..4.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_deep_orange_300)); + + } + if(ratenumber in 1.0..3.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.red_500)); + + + } + tvDistance.text = restaurantModel.formatDistance imDistance.setImageResource(if (restaurantModel.distance > 1.5) R.drawable.ic_distance_vehicle else R.drawable.ic_distance_walking) From 6f582689c5f3132f70abca79b07e6c31f63efe47 Mon Sep 17 00:00:00 2001 From: sanyud24 <57134307+sanyud24@users.noreply.github.com> Date: Mon, 7 Sep 2020 00:44:12 +0530 Subject: [PATCH 2/9] Update PublicRestaurantProfileActivity.kt updated public restaurant rating color --- .../PublicRestaurantProfileActivity.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt index 4633f659..6fea5c8b 100644 --- a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt +++ b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt @@ -393,21 +393,21 @@ class PublicRestaurantProfileActivity : BaseActivity(), AppBarLayout.OnOffsetCha } else "-" } ?: "-" tvRating.text = restaurantModel.formatRating() - val ratingtext: String = tvRating.text.toString(); - val ratenumber: Float = ratingtext.toFloat() - if(ratenumber in 4.0..5.0){ + if(restaurantModel.rating in 4.0..5.0) + { + tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_green_400)); - } - if(ratenumber in 3.0..4.0){ - tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_deep_orange_300)); + } + if(restaurantModel.rating in 3.0..4.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_deep_orange_300)); - } - if(ratenumber in 1.0..3.0){ - tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.red_500)); + } + else{ + tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.red_500)); - } + } tvDistance.text = restaurantModel.formatDistance From 5f05deda1853f4cdb5f9d6a9364e7f81e7095f11 Mon Sep 17 00:00:00 2001 From: sanyud24 <57134307+sanyud24@users.noreply.github.com> Date: Mon, 7 Sep 2020 01:18:59 +0530 Subject: [PATCH 3/9] updated epoxy nearby restaurant model --- .../home/epoxy/NearbyRestaurantModelHolder.kt | 15 +++++++++++++++ .../activities/PublicRestaurantProfileActivity.kt | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt index 4fd83756..269ac336 100644 --- a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt +++ b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt @@ -65,6 +65,21 @@ abstract class NearbyRestaurantModelHolder : EpoxyModelWithHolder 1.5) R.drawable.ic_distance_vehicle else R.drawable.ic_distance_walking) diff --git a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt index 6fea5c8b..375bad42 100644 --- a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt +++ b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt @@ -399,11 +399,11 @@ class PublicRestaurantProfileActivity : BaseActivity(), AppBarLayout.OnOffsetCha tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_green_400)); } - if(restaurantModel.rating in 3.0..4.0){ + else if(restaurantModel.rating in 3.0..4.0){ tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_deep_orange_300)); } - else{ + else if(restaurantModel.rating<=3){ tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.red_500)); From bf7a767dfb451fb6af52f5e2531fce5997db6c07 Mon Sep 17 00:00:00 2001 From: sanyud24 <57134307+sanyud24@users.noreply.github.com> Date: Wed, 9 Sep 2020 00:48:41 +0530 Subject: [PATCH 4/9] Update NearbyRestaurantModelHolder.kt --- .../app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt index 269ac336..d2dce761 100644 --- a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt +++ b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt @@ -5,6 +5,7 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat import butterknife.BindView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass From 4a4d9c627b8da24728148ad35c38fe0aaec6fc9e Mon Sep 17 00:00:00 2001 From: sanyud24 <57134307+sanyud24@users.noreply.github.com> Date: Tue, 15 Sep 2020 12:59:06 +0530 Subject: [PATCH 5/9] RatingExtension --- .../checkin/app/checkin/Shop/Utilitiesext.kt | 54 +++++++++++++++++++ .../home/epoxy/NearbyRestaurantModelHolder.kt | 15 +----- .../PublicRestaurantProfileActivity.kt | 17 +----- 3 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt diff --git a/app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt b/app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt new file mode 100644 index 00000000..ea89175f --- /dev/null +++ b/app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt @@ -0,0 +1,54 @@ +package com.checkin.app.checkin.Shop + +import android.content.Context +import android.graphics.Color +import android.widget.TextView +import androidx.core.content.ContextCompat +import com.checkin.app.checkin.R +import com.checkin.app.checkin.home.epoxy.NearbyRestaurantModelHolder +import com.checkin.app.checkin.restaurant.activities.PublicRestaurantProfileActivity +import io.objectbox.BoxStore +import io.objectbox.BoxStore.context + + + + + fun NearbyRestaurantModelHolder.changerating(ratings:Double, tvRating :TextView){ + if(ratings in 4.0..5.0) + { + + tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.apple_green)); + + } + else if(ratings in 3.0..4.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.orange_red)); + + } + else if(ratings< 3.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.primary_red)); + + + } + } + +fun PublicRestaurantProfileActivity.changerating(ratings:Float, tvRating :TextView){ + if(ratings in 4.0..5.0) + { + + tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.apple_green)); + + } + else if(ratings in 3.0..4.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.orange_red)); + + } + else if(ratings< 3.0){ + tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.primary_red)); + + + } +} + + + + diff --git a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt index d2dce761..d9eb0fae 100644 --- a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt +++ b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt @@ -66,21 +66,8 @@ abstract class NearbyRestaurantModelHolder : EpoxyModelWithHolder 1.5) R.drawable.ic_distance_vehicle else R.drawable.ic_distance_walking) diff --git a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt index 375bad42..98ff2cbb 100644 --- a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt +++ b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt @@ -393,21 +393,8 @@ class PublicRestaurantProfileActivity : BaseActivity(), AppBarLayout.OnOffsetCha } else "-" } ?: "-" tvRating.text = restaurantModel.formatRating() - if(restaurantModel.rating in 4.0..5.0) - { - - tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_green_400)); - - } - else if(restaurantModel.rating in 3.0..4.0){ - tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.md_deep_orange_300)); - - } - else if(restaurantModel.rating<=3){ - tvRating.setBackgroundColor(ContextCompat.getColor(this,R.color.red_500)); - - - } + + changerating(restaurantModel.rating,tvRating) tvDistance.text = restaurantModel.formatDistance From 9fb92ddf39b92d1fc4d18b398cba5a95c486df8b Mon Sep 17 00:00:00 2001 From: sanyud24 <57134307+sanyud24@users.noreply.github.com> Date: Tue, 15 Sep 2020 15:55:16 +0530 Subject: [PATCH 6/9] Update NearbyRestaurantModelHolder.kt --- .../app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt index d9eb0fae..3a4f7c9d 100644 --- a/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt +++ b/app/src/main/java/com/checkin/app/checkin/home/epoxy/NearbyRestaurantModelHolder.kt @@ -11,6 +11,7 @@ import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder import com.checkin.app.checkin.R +import com.checkin.app.checkin.Shop.changerating import com.checkin.app.checkin.home.model.NearbyRestaurantModel import com.checkin.app.checkin.misc.epoxy.BaseEpoxyHolder import com.checkin.app.checkin.restaurant.activities.openPublicRestaurantProfile @@ -66,7 +67,8 @@ abstract class NearbyRestaurantModelHolder : EpoxyModelWithHolder Date: Thu, 24 Sep 2020 21:54:16 +0530 Subject: [PATCH 7/9] rating --- .../checkin/app/checkin/Shop/Utilitiesext.kt | 40 ++++++++----------- .../PublicRestaurantProfileActivity.kt | 1 + 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt b/app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt index ea89175f..9c227e80 100644 --- a/app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt +++ b/app/src/main/java/com/checkin/app/checkin/Shop/Utilitiesext.kt @@ -14,41 +14,33 @@ import io.objectbox.BoxStore.context fun NearbyRestaurantModelHolder.changerating(ratings:Double, tvRating :TextView){ - if(ratings in 4.0..5.0) - { - - tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.apple_green)); - - } - else if(ratings in 3.0..4.0){ - tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.orange_red)); - - } - else if(ratings< 3.0){ - tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.primary_red)); - - - } + rate(ratings.toFloat(),tvRating) } fun PublicRestaurantProfileActivity.changerating(ratings:Float, tvRating :TextView){ - if(ratings in 4.0..5.0) - { + rate(ratings,tvRating) - tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.apple_green)); +} - } - else if(ratings in 3.0..4.0){ - tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.orange_red)); +fun rate(ratings:Float, tvrating :TextView){ + when(ratings){ + in 4.0..5.0 -> tvrating.setBackgroundResource(R.color.apple_green) + in 3.0..4.0 -> tvrating.setBackgroundResource(R.color.orange_red) + else -> tvrating.setBackgroundResource(R.color.primary_red) } - else if(ratings< 3.0){ - tvRating.setBackgroundColor(ContextCompat.getColor(context as Context, R.color.primary_red)); +} +/*fun ratingvalue(rating: Float,color: Int): Int { + when(rating){ + in 4.0..5.0 -> color== R.color.apple_green + in 3.0..4.0 -> color==R.color.orange_red + else -> color == R.color.primary_red } + return color } - + */ diff --git a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt index 98ff2cbb..ade87d12 100644 --- a/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt +++ b/app/src/main/java/com/checkin/app/checkin/restaurant/activities/PublicRestaurantProfileActivity.kt @@ -24,6 +24,7 @@ import butterknife.BindView import butterknife.ButterKnife import butterknife.OnClick import com.checkin.app.checkin.R +import com.checkin.app.checkin.Shop.changerating import com.checkin.app.checkin.auth.exceptions.InvalidOTPException import com.checkin.app.checkin.auth.fragments.OtpVerificationDialog import com.checkin.app.checkin.auth.fragments.PhoneEditDialog From da96ea9e9f2619fe001690c595f8c067891b8512 Mon Sep 17 00:00:00 2001 From: sanyud24 <57134307+sanyud24@users.noreply.github.com> Date: Thu, 24 Sep 2020 23:36:23 +0530 Subject: [PATCH 8/9] optimized imports ,jarfile and other files got added on their on --- .idea/codeStyles/Project.xml | 18 +++++++++++ .idea/jarRepositories.xml | 45 +++++++++++++++++++++++++++ app/objectbox-models/default.json.bak | 6 ++-- 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 681f41ae..0d156937 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,23 @@ + + + +