added feature "discount-codes" #2313

simarsingh24 · 2018-02-03T21:41:52Z

Mentions #2296
Screenshots for the change:

simarsingh24 · 2018-02-03T21:45:07Z

@iamareebjamal @srv-twry @mayank8318 @nikit19 Is this a good way to show discount-codes also this is initial steps (the indentation and refactors will be done later, UI will be improved etc )
This is just for review whether I am working in the right direction, the core logic for getting the discount-codes is right?

simarsingh24 · 2018-02-05T17:15:13Z

@iamareebjamal would that be okay if discount codes are shown here, if yes I would proceed further finalizing everything (UI will be changed a little and some more details of discount codes will be added)

iamareebjamal · 2018-02-05T19:16:08Z

I think AboutFragment has lost its actual use case, don't add it there. Create a new section

simarsingh24 · 2018-02-06T17:25:47Z

This is how it looks now, created a new section in navigation for discount codes.
@iamareebjamal please tell me out of these which fields of discount codes should be displayed here since the API is mostly returning null or 0 values.

iamareebjamal · 2018-02-06T20:43:50Z

Show the fields which only have non null values

dr0pdb

Please make the download lazy i.e. Download should be done after the user enters the fragment.
Also remove the dependency on the event bus pattern.

simarsingh24 · 2018-02-07T10:11:28Z

@srv-twry yeah that i will do also because in order to view dicount codes Authentication is necessary ie user should be logged in, so that check and downloading part will be moved to fragment

simarsingh24 · 2018-02-10T06:35:24Z

screen shots after changes :

ghost · 2018-02-10T06:45:59Z

Hi @simarsingh24!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

Build 5110.1 has failed

simarsingh24 · 2018-02-13T18:16:03Z

@iamareebjamal please review

iamareebjamal · 2018-02-14T07:03:13Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountCodeFragment.java

+        Toast.makeText(getContext(), "User need to be logged in!", Toast.LENGTH_SHORT).show();
+        Intent intent = new Intent(getActivity(), LoginActivity.class);
+        startActivity(intent);
+    }


Several formatting related issues, please resolve

made some formatting changes, but couldn't find anything in this highlighted area

@iamareebjamal could you please confirm?

iamareebjamal · 2018-02-17T18:08:54Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountCodeFragment.java

+        setUpRecyclerView();
+        Utils.registerIfUrlValid(swipeRefreshLayout, this, this::refresh);
+        discountFragmentViewModel = ViewModelProviders.of(this).get(DiscountFragmentViewModel.class);
+        if(AuthUtil.isUserLoggedIn()) {


iamareebjamal · 2018-02-17T18:09:02Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountCodeFragment.java

+        Utils.registerIfUrlValid(swipeRefreshLayout, this, this::refresh);
+        discountFragmentViewModel = ViewModelProviders.of(this).get(DiscountFragmentViewModel.class);
+        if(AuthUtil.isUserLoggedIn()) {
+            if(NetworkUtils.haveNetworkConnection(getContext())) {


iamareebjamal · 2018-02-17T18:09:10Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountCodeFragment.java

+                downloadDiscountCodes();
+            }
+            loadData();
+        }else {


simarsingh24 · 2018-02-19T16:19:55Z

made requested changes and squashed commits

iamareebjamal · 2018-02-20T03:09:47Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountViewHolder.java

+        if (!TextUtils.isEmpty(field.trim())) {
+            textView.setVisibility(View.VISIBLE);
+            field = prefix + field;
+            textView.setText(field);


Directly set prefix + field in TextView

iamareebjamal · 2018-02-20T03:10:08Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountViewHolder.java

+    }
+
+
+    private void setStringField(TextView textView, String field, String prefix) {


Rename the function appropriately

simarsingh24 · 2018-02-22T17:14:27Z

squashed commits

iamareebjamal · 2018-02-22T19:28:08Z

android/app/src/main/res/values/dimens.xml

@@ -44,7 +44,7 @@
    <dimen name="heading_text_size">20sp</dimen>
    <dimen name="text_size_expanded_title">22sp</dimen>
    <dimen name="text_size_extra_large">18sp</dimen>
-    <dimen name="text_size_large">16sp</dimen>
+    <dimen name="text_size_large">20sp</dimen>


Why is large 20sp and extra large 18 sp?

reverting back to 16sp

changed nav icon indentation changes indentation changes indentation changes refactor changes minor change

simarsingh24 · 2018-03-18T05:11:13Z

@iamareebjamal please review

iamareebjamal · 2018-03-18T07:43:43Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountViewHolder.java

+        ButterKnife.bind(this, itemView);
+
+
+    }


extra lines

iamareebjamal · 2018-03-18T07:43:53Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountViewHolder.java

+
+    public void bindDiscountCode(DiscountCode discountCode) {
+
+        String code = Utils.checkStringEmpty(discountCode.getCode());


extra lines

iamareebjamal · 2018-03-18T07:44:22Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountViewHolder.java

+        setStringFieldWithPrefix(discountUsedFor, usedFor, "Used For : ");
+        setStringFieldWithPrefix(this.discountUrl, discountUrl, "Discount URL : ");
+
+    }


iamareebjamal · 2018-03-18T07:45:11Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountViewHolder.java

+        setStringFieldWithPrefix(discountCodeTextView, code, "");
+        setStringFieldWithPrefix(discountCodeValue, "Value : "+value, "");
+        setStringFieldWithPrefix(discountMinQuantity, "Minimum Quantity : "+minQuantity, "");
+        setStringFieldWithPrefix(discountMaxQuantity, "Maximum Quantity :"+maxQuantity, "");


Spacing between +

I'd recommend using template strings

do you mean use of strings.xml
like this :
<string name="MinQuanString">Minimum Quantity : %1$d </string>

iamareebjamal · 2018-03-18T07:45:44Z

android/app/src/main/java/org/fossasia/openevent/core/discount/DiscountViewHolder.java

+        setStringFieldWithPrefix(discountCodeTextView, code, "");
+        setStringFieldWithPrefix(discountCodeValue, "Value : "+value, "");
+        setStringFieldWithPrefix(discountMinQuantity, "Minimum Quantity : "+minQuantity, "");
+        setStringFieldWithPrefix(discountMaxQuantity, "Maximum Quantity :"+maxQuantity, "");


Rather than using "" empty strings, pass null and check for the same

simarsingh24 · 2018-03-18T11:20:20Z

@iamareebjamal discount codes are not being displayed now! can you point out what went wrong in the last commit ?

ghost added the needs-review label Feb 3, 2018

ghost assigned simarsingh24 Feb 3, 2018

simarsingh24 force-pushed the discount branch from 812d84b to fdf63df Compare February 3, 2018 21:59

fossasia deleted a comment Feb 3, 2018

simarsingh24 force-pushed the discount branch from fdf63df to 6680349 Compare February 6, 2018 17:20

fossasia deleted a comment Feb 6, 2018

dr0pdb suggested changes Feb 7, 2018

View reviewed changes

simarsingh24 force-pushed the discount branch from 6680349 to bb46cbf Compare February 10, 2018 06:33

fossasia deleted a comment Feb 10, 2018

simarsingh24 force-pushed the discount branch from bb46cbf to 597046c Compare February 10, 2018 06:42

fossasia deleted a comment Feb 10, 2018

simarsingh24 force-pushed the discount branch from 597046c to 7cb5dfb Compare February 10, 2018 06:53

fossasia deleted a comment Feb 10, 2018

iamareebjamal suggested changes Feb 14, 2018

View reviewed changes

fossasia deleted a comment Feb 14, 2018

iamareebjamal reviewed Feb 17, 2018

View reviewed changes

simarsingh24 force-pushed the discount branch from 9d793d7 to d6ecf50 Compare February 19, 2018 16:17

fossasia deleted a comment Feb 19, 2018

iamareebjamal suggested changes Feb 20, 2018

View reviewed changes

fossasia deleted a comment Feb 21, 2018

simarsingh24 force-pushed the discount branch from 92e6338 to 64d91d4 Compare February 22, 2018 17:14

fossasia deleted a comment Feb 22, 2018

iamareebjamal suggested changes Feb 22, 2018

View reviewed changes

added discount codes

2651fae

changed nav icon indentation changes indentation changes indentation changes refactor changes minor change

simarsingh24 force-pushed the discount branch from 64d91d4 to 2651fae Compare March 18, 2018 04:55

fossasia deleted a comment Mar 18, 2018

iamareebjamal suggested changes Mar 18, 2018

View reviewed changes

indentation changes

fa9cf20

fossasia deleted a comment Mar 18, 2018

used string template

ac63e05

fossasia deleted a comment Mar 18, 2018

iamareebjamal approved these changes Mar 18, 2018

View reviewed changes

ghost removed the needs-review label Mar 18, 2018

iamareebjamal merged commit d41e69a into fossasia:development Mar 18, 2018

ghost added the ready-to-ship label Mar 18, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added feature "discount-codes" #2313

added feature "discount-codes" #2313

simarsingh24 commented Feb 3, 2018

simarsingh24 commented Feb 3, 2018 •

edited

Loading

simarsingh24 commented Feb 5, 2018

iamareebjamal commented Feb 5, 2018

simarsingh24 commented Feb 6, 2018

iamareebjamal commented Feb 6, 2018

dr0pdb left a comment

simarsingh24 commented Feb 7, 2018

simarsingh24 commented Feb 10, 2018

ghost commented Feb 10, 2018

simarsingh24 commented Feb 13, 2018

iamareebjamal Feb 14, 2018

simarsingh24 Feb 14, 2018

simarsingh24 Feb 17, 2018

iamareebjamal Feb 17, 2018

iamareebjamal Feb 17, 2018

iamareebjamal Feb 17, 2018

simarsingh24 commented Feb 19, 2018

iamareebjamal Feb 20, 2018

simarsingh24 Feb 21, 2018

iamareebjamal Feb 20, 2018

simarsingh24 Feb 21, 2018

simarsingh24 commented Feb 22, 2018

iamareebjamal Feb 22, 2018

simarsingh24 Mar 18, 2018

simarsingh24 commented Mar 18, 2018

iamareebjamal Mar 18, 2018

iamareebjamal Mar 18, 2018

iamareebjamal Mar 18, 2018

iamareebjamal Mar 18, 2018

simarsingh24 Mar 18, 2018 •

edited

Loading

iamareebjamal Mar 18, 2018

iamareebjamal Mar 18, 2018

simarsingh24 commented Mar 18, 2018

		}


		private void setStringField(TextView textView, String field, String prefix) {


		public void bindDiscountCode(DiscountCode discountCode) {

		String code = Utils.checkStringEmpty(discountCode.getCode());

added feature "discount-codes" #2313

added feature "discount-codes" #2313

Conversation

simarsingh24 commented Feb 3, 2018

simarsingh24 commented Feb 3, 2018 • edited Loading

simarsingh24 commented Feb 5, 2018

iamareebjamal commented Feb 5, 2018

simarsingh24 commented Feb 6, 2018

iamareebjamal commented Feb 6, 2018

dr0pdb left a comment

Choose a reason for hiding this comment

simarsingh24 commented Feb 7, 2018

simarsingh24 commented Feb 10, 2018

ghost commented Feb 10, 2018

simarsingh24 commented Feb 13, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simarsingh24 commented Feb 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simarsingh24 commented Feb 22, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simarsingh24 commented Mar 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simarsingh24 Mar 18, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simarsingh24 commented Mar 18, 2018

simarsingh24 commented Feb 3, 2018 •

edited

Loading

simarsingh24 Mar 18, 2018 •

edited

Loading