//PromoCompliance Default Toggle Changes

This commit is contained in:
Gagan290
2017-02-03 11:01:17 +05:30
parent 5fca35c584
commit d4ca1184cf
11 changed files with 596 additions and 6 deletions
+8 -4
View File
@@ -100,14 +100,12 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".gsk_dailyentry.DailyDataMenuActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".gsk_dailyentry.MSL_AvailabilityActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
@@ -150,8 +148,8 @@
android:name=".upload.UploadActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_upload"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".dailyentry.SettingsActivity"
android:label="@string/title_activity_settings"
@@ -172,6 +170,12 @@
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_upload"
android:screenOrientation="portrait" />
<activity
android:name=".gsk_dailyentry.StockFacing_PlanogramTrackerActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_stock_facing__planogram_tracker"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
</application>
</manifest>
@@ -0,0 +1,108 @@
package cpm.com.gskmtorange.gsk_dailyentry;
import android.app.Dialog;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.view.Window;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
import cpm.com.gskmtorange.R;
public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
Button btn_addShelf, btn_addSKU;
RecyclerView recyclerView;
String brand, brand_id, company_id, sub_category, sub_category_id;
String addShelfPosition = "";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_stock_facing__planogram_tracker);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
btn_addShelf = (Button) findViewById(R.id.btn_addShelf);
btn_addSKU = (Button) findViewById(R.id.btn_addSKU);
recyclerView = (RecyclerView) findViewById(R.id.recyclerView_stockFacingPlanogramTracker);
Intent intent = getIntent();
brand = intent.getStringExtra("brand");
brand_id = intent.getStringExtra("brand_id");
company_id = intent.getStringExtra("company_id");
sub_category = intent.getStringExtra("sub_category");
sub_category_id = intent.getStringExtra("sub_category_id");
/*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
});*/
btn_addSKU.setEnabled(false);
btn_addShelf.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(final View view1) {
final Dialog dialog = new Dialog(StockFacing_PlanogramTrackerActivity.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
dialog.setContentView(R.layout.dialog_stock_facing_planogram_tracker);
final EditText ed_shelf_position = (EditText) dialog.findViewById(R.id.ed_shelf_position);
Button addShelf = (Button) dialog.findViewById(R.id.dialog_btn_addShelf);
Button cancel = (Button) dialog.findViewById(R.id.dialog_btn_cancel);
cancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
dialog.dismiss();
}
});
addShelf.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
addShelfPosition = ed_shelf_position.getText().toString().trim();
if (!addShelfPosition.equals("")) {
dialog.dismiss();
btn_addSKU.setEnabled(true);
} else {
/*Snackbar.make(view1, getResources().getString(R.string.empty_field), Snackbar.LENGTH_LONG)
.setAction("Action", null).show();*/
Toast.makeText(StockFacing_PlanogramTrackerActivity.this,
getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show();
}
}
});
dialog.show();
}
});
String s = addShelfPosition;
btn_addSKU.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Toast.makeText(StockFacing_PlanogramTrackerActivity.this, "Add SKU", Toast.LENGTH_SHORT).show();
}
});
}
}
@@ -947,6 +947,21 @@ public class Stock_FacingActivity extends AppCompatActivity {
//Camera allow disable
img_camera1.setBackgroundResource(R.mipmap.camera_grey);
img_camera2.setBackgroundResource(R.mipmap.camera_grey);
img_camera1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(Stock_FacingActivity.this, StockFacing_PlanogramTrackerActivity.class);
intent.putExtra("brand", headerTitle.getBrand());
intent.putExtra("brand_id", headerTitle.getBrand_id());
intent.putExtra("company_id", headerTitle.getCompany_id());
intent.putExtra("sub_category", headerTitle.getSub_category());
intent.putExtra("sub_category_id", headerTitle.getSub_category_id());
startActivity(intent);
}
});
}
if (headerTitle.getCompany_id().equals("1")) {
@@ -0,0 +1,138 @@
package cpm.com.gskmtorange.xmlGetterSetter;
/**
* Created by gagang on 23-12-2016.
*/
public class Stock_Facing_PlanogramTrackerGetterSetter {
String category_id, sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target;
public String getSub_category_id() {
return sub_category_id;
}
public void setSub_category_id(String sub_category_id) {
this.sub_category_id = sub_category_id;
}
public String getSub_category() {
return sub_category;
}
public void setSub_category(String sub_category) {
this.sub_category = sub_category;
}
public String getBrand_id() {
return brand_id;
}
public void setBrand_id(String brand_id) {
this.brand_id = brand_id;
}
public String getBrand() {
return brand;
}
public void setBrand(String brand) {
this.brand = brand;
}
public String getSku_id() {
return sku_id;
}
public void setSku_id(String sku_id) {
this.sku_id = sku_id;
}
public String getSku() {
return sku;
}
public void setSku(String sku) {
this.sku = sku;
}
public String getMrp() {
return mrp;
}
public void setMrp(String mrp) {
this.mrp = mrp;
}
public String getSku_sequence() {
return sku_sequence;
}
public void setSku_sequence(String sku_sequence) {
this.sku_sequence = sku_sequence;
}
public String getStock() {
return stock;
}
public void setStock(String stock) {
this.stock = stock;
}
public String getFacing() {
return facing;
}
public void setFacing(String facing) {
this.facing = facing;
}
public String getMbq() {
return mbq;
}
public void setMbq(String mbq) {
this.mbq = mbq;
}
public String getCompany_id() {
return company_id;
}
public void setCompany_id(String company_id) {
this.company_id = company_id;
}
public String getImage1() {
return image1;
}
public void setImage1(String image1) {
this.image1 = image1;
}
public String getImage2() {
return image2;
}
public void setImage2(String image2) {
this.image2 = image2;
}
public String getCategory_id() {
return category_id;
}
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
public String getSos_target() {
return sos_target;
}
public void setSos_target(String sos_target) {
this.sos_target = sos_target;
}
}
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="#FFF" />
<stroke
android:width="1dp"
android:color="@color/colorPrimary" />
</shape>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="15dp" />
<!--<solid android:color="#FFF" />-->
<stroke
android:width="2dp"
android:color="@color/colorPrimary" />
</shape>
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.gsk_dailyentry.StockFacing_PlanogramTrackerActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_stock_facing__planogram_tracker" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />
</android.support.design.widget.CoordinatorLayout>
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content_stock_facing__planogram_tracker"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.gsk_dailyentry.StockFacing_PlanogramTrackerActivity"
tools:showIn="@layout/activity_stock_facing__planogram_tracker">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp">
<Button
android:id="@+id/btn_addShelf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="Add Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_addSKU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="Add SKU"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_dark_background" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_stockFacingPlanogramTracker"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</RelativeLayout>
@@ -0,0 +1,207 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
card_view:cardBackgroundColor="@color/light_orange_background"
card_view:cardCornerRadius="20dp">
<!--android:background="@drawable/bg_boarder_orange_transparent"-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/light_orange_background"
android:orientation="vertical">
<!--Dialog Title-->
<LinearLayout
android:id="@+id/lin_dialog_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:paddingLeft="20dp"
android:paddingRight="10dp"
android:paddingTop="15dp"
android:text="Add Shelf"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/colorPrimary" />
</LinearLayout>
<View
android:id="@+id/view_divider"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/colorPrimary" />
<!--Add Shelf Position Value-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="10dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="6"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="5"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="4"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="3"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="2"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="10dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:text="Position on Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<EditText
android:id="@+id/ed_shelf_position"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_horizontal"
android:hint=""
android:maxLength="10"
android:inputType="number"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:textColorHint="@color/colorPrimary" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/view_divider1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorPrimary" />
<!--Bottom Buttom-->
<RelativeLayout
android:id="@+id/rel_addShelf_Cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="10dp">
<Button
android:id="@+id/dialog_btn_addShelf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="Add Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
<Button
android:id="@+id/dialog_btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="Cancel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
+2 -1
View File
@@ -7,11 +7,12 @@
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<color name="grey_background">#EEEEEE</color>
<color name="grey_dark_background">#888</color>
<color name="light_orange_background">#FFF4D19D</color>
<color name="green">#FF27A404</color>
<color name="blue">#2196F3</color>
<color name="colorOrange">#FFE0B2</color>
</resources>
+2 -1
View File
@@ -251,7 +251,7 @@
<string name="select_promo">Select</string>
<!--Gagan end code 3-->
//text for uploading screen
<string name="coverage_data_uploading">Coverage Uploading</string>
<string name="availability_data_uploading">Availability Data Uploading</string>
@@ -265,5 +265,6 @@
<string name="first_geotag_the_store">First geotag the store</string>
<string name="new_update_available">New Update Available \n\n Yeni güncelleme var</string>
<string name="title_activity_stock_facing__planogram_tracker">Planogram Tracker</string>
</resources>