Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -1,5 +1,5 @@
 final VERSION_MAJOR = 2 // max two digits
-final VERSION_MINOR = 4 // max two digits
+final VERSION_MINOR = 5 // max two digits
 final VERSION_PATCH = 0 // max two digits
 final VERSION_BUILD = 0 // max three digits
 

app/src/main/java/com/foodscan/Activity/MainActivity.java

@@ -45,7 +45,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     private static final String TAG = MainActivity.class.getSimpleName();
     public FrameLayout frame_main;
-    public boolean needDialog = false;
+    public boolean needDialog = true;
     public DTOUser dtoUser;
     public ViewPager viewPager;
     public ViewPagerAdapter adapter;

app/src/main/java/com/foodscan/Activity/PrivacyPolicyActivity.java

@@ -58,8 +58,6 @@ public void onClick(View v) {
             }
             break;
 
-
         }
-
     }
 }

app/src/main/java/com/foodscan/Activity/ProductDetailsActivity.java

@@ -107,21 +107,10 @@ private void initGlobals() {
                 }
 
                 String isHealthy = dtoProduct.getIsHealthy();
-                if (isHealthy != null && isHealthy.length() > 0) {
-                    if (isHealthy.equals("0")) {
-
-                        //Not healthy
-                        txt_is_healthy.setText(mContext.getString(R.string.Poor));
-                        txt_is_healthy.setCompoundDrawablesWithIntrinsicBounds(R.drawable.circle_bg_red_small, 0, 0, 0);
-                        txt_is_healthy.setTextColor(Utility.getColorWrapper(mContext, R.color.red));
-
-                    } else if (isHealthy.equals("1")) {
-
-                        //Healthy
-                        txt_is_healthy.setText(mContext.getString(R.string.Excellent));
-                        txt_is_healthy.setCompoundDrawablesWithIntrinsicBounds(R.drawable.circle_bg_green_small, 0, 0, 0);
-                        txt_is_healthy.setTextColor(Utility.getColorWrapper(mContext, R.color.colorAccent));
-                    }
+                if (isHealthy != null && isHealthy.length() > 0 && isHealthy.equals("1")) {
+                    txt_is_healthy.setText(mContext.getString(R.string.Healthy));
+                    txt_is_healthy.setCompoundDrawablesWithIntrinsicBounds(R.drawable.circle_bg_green_small, 0, 0, 0);
+                    txt_is_healthy.setTextColor(Utility.getColorWrapper(mContext, R.color.colorAccent));
                 }
             }
         }

app/src/main/java/com/foodscan/Activity/SettingsActivity.java

@@ -108,7 +108,7 @@ public void onClick(View v) {
 
             case R.id.rl_terms: {
 
-                Intent intent = new Intent(mContext, PrivacyPolicyActivity.class);
+                Intent intent = new Intent(mContext, TermsConditionActivity.class);
                 startActivity(intent);
 
             }

app/src/main/java/com/foodscan/Activity/TermsConditionActivity.java

@@ -0,0 +1,63 @@
+package com.foodscan.Activity;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.webkit.WebView;
+import android.widget.ImageView;
+
+import com.foodscan.R;
+import com.foodscan.Utility.UserDefaults;
+
+public class TermsConditionActivity extends AppCompatActivity implements View.OnClickListener {
+
+    private static final String TAG = TermsConditionActivity.class.getSimpleName();
+
+    private Context mContext;
+
+    private WebView webView;
+    private ImageView img_back;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_terms_condition);
+        overridePendingTransition(R.anim.slide_right, R.anim.translate);
+
+        mContext = TermsConditionActivity.this;
+
+        initView();
+        initGlobals();
+    }
+
+    private void initView() {
+
+        webView = findViewById(R.id.webview);
+        img_back = findViewById(R.id.img_back);
+
+    }
+
+    private void initGlobals() {
+
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.loadUrl(UserDefaults.TERMS_CONDITION);
+
+        img_back.setOnClickListener(this);
+
+    }
+
+    @Override
+    public void onClick(View v) {
+
+        switch (v.getId()) {
+
+            case R.id.img_back: {
+                onBackPressed();
+            }
+            break;
+
+        }
+    }
+}

app/src/main/java/com/foodscan/Adapter/FavouriteAdapter.java

@@ -96,20 +96,12 @@ public void onBindViewHolder(final SimpleViewHolder viewHolder, final int positi
                 }
             }
 
-/*
-            /* Shows if the product is organic or not */
+            /* Shows if the product is organic */
             String isOrganic = dtoProduct.getIsOrganic();
-            if (isOrganic != null && isOrganic.length() > 0) {
-                if (isOrganic.equals("0")) {
-                    //not Natural product
-                    viewHolder.txt_product_type.setText(mContext.getString(R.string.Not_Natural_Product));
-
-                } else if (isOrganic.equals("1")) {
-                    //Natural product
-                    viewHolder.txt_product_type.setText(mContext.getString(R.string.Natural_Product));
-                }
+            if (isOrganic != null && isOrganic.length() > 0 && isOrganic.equals("1")) {
+                //Natural product
+                viewHolder.txt_product_type.setText(mContext.getString(R.string.Natural_Product));
             }
-//*/
 
             String createdDate = dtoProduct.getFavouriteCreatedDate();
             if (createdDate != null && createdDate.length() > 0) {

app/src/main/java/com/foodscan/Adapter/FoodDetailsAdapter.java

@@ -38,27 +38,18 @@ public void onBindViewHolder(final SimpleViewHolder viewHolder, final int positi
         if (dtoProduct != null) {
 
             if (position == 0) {
-                //************** Organic  **************//
-
-/*
+                //************** Organic **************//
                 String isOrganic = dtoProduct.getIsOrganic();
-                if (isOrganic != null && isOrganic.length() > 0) {
-                    if (isOrganic.equals("1")) {
-                        viewHolder.txt_content_amount.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.circle_bg_green_small, 0);
-                        viewHolder.txt_content_name.setText(mContext.getString(R.string.Organic));
-                        viewHolder.txt_content_comments.setText(mContext.getString(R.string.Natural_Product));
-                    } else { // not organic :(
-                        viewHolder.txt_content_amount.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.circle_bg_red_small, 0);
-                        viewHolder.txt_content_name.setText(mContext.getString(R.string.not_Organic));
-                        viewHolder.txt_content_comments.setText(mContext.getString(R.string.Not_Natural_Product));
-                    }
+                if (isOrganic != null && isOrganic.length() > 0 && isOrganic.equals("1")) {
+                    viewHolder.txt_content_amount.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.circle_bg_green_small, 0);
+                    viewHolder.txt_content_name.setText(mContext.getString(R.string.Organic));
+                    viewHolder.txt_content_comments.setText(mContext.getString(R.string.Natural_Product));
 
                     viewHolder.img_content.setImageResource(R.drawable.img_organic);
                     viewHolder.setVisibility(true);
                 } else {
-//*/
-                viewHolder.setVisibility(false);
-//              }
+                    viewHolder.setVisibility(false);
+                }
 
             } else if (position == 1) {
                 //************** Protein  **************//

app/src/main/java/com/foodscan/Adapter/HistoryAdapter.java

@@ -102,19 +102,11 @@ public void onBindViewHolder(final SimpleViewHolder viewHolder, final int positi
                 }
             }
 
-/*
             String isOrganic = dtoProduct.getIsOrganic();
-            if (isOrganic != null && isOrganic.length() > 0) {
-                if (isOrganic.equals("0")) {
-                    //not Natural product
-                    viewHolder.txt_product_type.setText(mContext.getString(R.string.Not_Natural_Product));
-
-                } else if (isOrganic.equals("1")) {
-                    //Natural product
-                    viewHolder.txt_product_type.setText(mContext.getString(R.string.Natural_Product));
-                }
+            if (isOrganic != null && isOrganic.length() > 0 && isOrganic.equals("1")) {
+                //Natural product
+                viewHolder.txt_product_type.setText(mContext.getString(R.string.Natural_Product));
             }
-//*/
 
             String createdDate = dtoProduct.getHistoryCreatedDate();
             if (createdDate != null && createdDate.length() > 0) {

app/src/main/java/com/foodscan/Utility/UserDefaults.java

@@ -19,7 +19,8 @@ public class UserDefaults {
     public static int REQ_DETAILS = 101;
     public static final String ENCODE_KEY = "key_global_pwd";
     public static final String ENCODE_KEY_IV = "key_iv";
-    public static final String PRIVACY_POLICY = "https://lifyzer.com/tos.txt ";
+    public static final String PRIVACY_POLICY = "https://lifyzer.com/privacy.txt";
+    public static final String TERMS_CONDITION = "https://lifyzer.com/tos.txt";
     public static final String CURRENT_FRAG = "currentFrag";
     public static boolean isFLashLightOn= false;
 

app/src/main/res/layout/activity_privacy_policy.xml

@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:text="@string/Terms_and_Condition"
+            android:text="@string/Privacy"
             android:textColor="@color/white"
             android:textSize="@dimen/sp16" />
 

app/src/main/res/layout/activity_settings.xml

@@ -8,7 +8,6 @@
     tools:context="com.foodscan.Activity.SettingsActivity">
 
     <!--Toolbar-->
-
     <RelativeLayout
         android:id="@+id/rl_toolbar"
         android:layout_width="match_parent"
@@ -28,10 +27,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:src="@drawable/img_back_white"
-            android:padding="@dimen/dp10" />
-
-
+            android:padding="@dimen/dp10"
+            android:src="@drawable/img_back_white" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -51,17 +48,16 @@
             <com.foodscan.CustomViews.TextViewCustom
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/Edit_profile"
                 android:layout_centerVertical="true"
+                android:text="@string/Edit_profile"
                 android:textSize="@dimen/sp14" />
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/img_arror_right"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
-
+                android:layout_centerVertical="true"
+                android:src="@drawable/img_arrow_right" />
         </RelativeLayout>
 
         <View
@@ -77,24 +73,23 @@
             android:id="@+id/rl_change_pass"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp45"
+            android:layout_below="@+id/view1"
             android:paddingLeft="@dimen/dp10"
-            android:paddingRight="@dimen/dp10"
-            android:layout_below="@+id/view1">
+            android:paddingRight="@dimen/dp10">
 
             <com.foodscan.CustomViews.TextViewCustom
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/Change_password"
                 android:layout_centerVertical="true"
+                android:text="@string/Change_password"
                 android:textSize="@dimen/sp14" />
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/img_arror_right"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
-
+                android:layout_centerVertical="true"
+                android:src="@drawable/img_arrow_right" />
         </RelativeLayout>
 
         <View
@@ -105,64 +100,58 @@
             android:background="@color/black" />
 
         <!--Privacy-->
-
         <RelativeLayout
             android:id="@+id/rl_privacy"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp45"
-            android:paddingLeft="@dimen/dp10"
-            android:paddingRight="@dimen/dp10"
             android:layout_below="@+id/view2"
-            android:visibility="gone">
+            android:paddingLeft="@dimen/dp10"
+            android:paddingRight="@dimen/dp10">
 
             <com.foodscan.CustomViews.TextViewCustom
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/Privacy"
                 android:layout_centerVertical="true"
+                android:text="@string/Privacy"
                 android:textSize="@dimen/sp14" />
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/img_arror_right"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
-
+                android:layout_centerVertical="true"
+                android:src="@drawable/img_arrow_right" />
         </RelativeLayout>
 
         <View
             android:id="@+id/view3"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp0_2"
             android:layout_below="@+id/rl_privacy"
-            android:background="@color/black"
-            android:visibility="gone" />
+            android:background="@color/black" />
 
         <!--Terms and Conditions-->
-
         <RelativeLayout
             android:id="@+id/rl_terms"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp45"
+            android:layout_below="@+id/view3"
             android:paddingLeft="@dimen/dp10"
-            android:paddingRight="@dimen/dp10"
-            android:layout_below="@+id/view3">
+            android:paddingRight="@dimen/dp10">
 
             <com.foodscan.CustomViews.TextViewCustom
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/Terms_and_Condition"
                 android:layout_centerVertical="true"
+                android:text="@string/Terms_and_Condition"
                 android:textSize="@dimen/sp14" />
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/img_arror_right"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
-
+                android:layout_centerVertical="true"
+                android:src="@drawable/img_arrow_right" />
         </RelativeLayout>
 
         <View
@@ -171,19 +160,18 @@
             android:layout_height="@dimen/dp0_2"
             android:layout_below="@+id/rl_terms"
             android:background="@color/black" />
-
     </RelativeLayout>
 
     <com.foodscan.CustomViews.TextViewCustom
         android:id="@+id/txt_logout"
         style="@style/EditInputField"
+        android:layout_alignParentBottom="true"
         android:layout_marginTop="@dimen/dp40"
+        android:layout_marginBottom="@dimen/dp40"
         android:background="@drawable/tv_button_green"
         android:gravity="center"
         android:text="@string/Logout"
-        android:textStyle="normal"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/dp40" />
+        android:textStyle="normal" />
 
     <TextView
         android:id="@+id/version_number"