diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index edfe64b..f16711f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -264,12 +264,12 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_exit) { - Intent startDownload = new Intent(this,AdditionalVisibility.class); + /* Intent startDownload = new Intent(this,AdditionalVisibility.class); startActivity(startDownload); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); - - +*/ + finish(); } else if (id == R.id.nav_services) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index c2bf438..2c026fe 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -9,6 +9,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; @@ -49,6 +51,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.LoginActivity; @@ -98,6 +101,9 @@ public class T2PComplianceActivity extends AppCompatActivity { //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -168,7 +174,7 @@ public class T2PComplianceActivity extends AppCompatActivity { protected void onResume() { super.onResume(); - + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); } @@ -653,140 +659,6 @@ public class T2PComplianceActivity extends AppCompatActivity { alert.show(); } -/* public class T2PAdapter extends RecyclerView.Adapter { - - private ArrayList list; - - public T2PAdapter(ArrayList t2PList) { - list = t2PList; - } - - @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.t2p_item_layout, parent, false); - return new ViewHolder(view); - } - - @Override - public void onBindViewHolder(final ViewHolder holder, final int position) { - - final T2PGetterSetter mItem = list.get(position); - holder.tv_brand.setText(mItem.getBrand()); - holder.tv_display.setText(mItem.getDisplay().trim()); - - //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME)); - - *//* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); - FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); -*//* - holder.btn_gaps.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - showGapsDialog(mItem); - - } - }); - - holder.toggle_btn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); - - t2PAdapter.notifyDataSetChanged(); - } - }); - - - holder.btn_sku.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showSkuDialog(mItem.getSkulist()); - } - }); - - if (!img.equalsIgnoreCase("")) { - if (position == child_position) { - mItem.setImage(img); - img = ""; - } - } - - if(camera_allow.equals("1")){ - - holder.img_cam.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = position; - path = str + _pathforcheck; - - startCameraActivity(); - } - }); - - if (mItem.getImage().equals("")) { - holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); - } else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_green); - } - } - else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); - } - - - holder.toggle_btn.setChecked(mItem.isPresent()); - - if (mItem.getGapsChecklist().size() > 0) { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); - } else { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - - if (mItem.getSkulist().size() > 0) { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); - } else { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - - } - - @Override - public int getItemCount() { - return list.size(); - } - - public class ViewHolder extends RecyclerView.ViewHolder { - public final View mView; - public final LinearLayout parentLayout; - public final TextView tv_brand, tv_display; - public final ImageView img_cam, img_remark; - public final Button btn_gaps, btn_sku, btn_ref_img; - public final ToggleButton toggle_btn; - - - public ViewHolder(View view) { - super(view); - - mView = view; - - tv_brand = (TextView) mView.findViewById(R.id.tv_brand); - tv_display = (TextView) mView.findViewById(R.id.tv_display); - img_cam = (ImageView) mView.findViewById(R.id.img_cam); - img_remark = (ImageView) mView.findViewById(R.id.img_remark); - btn_gaps = (Button) mView.findViewById(R.id.btn_gaps); - btn_sku = (Button) mView.findViewById(R.id.btn_sku); - btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); - parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); - toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn); - - } - - } - }*/ public class GapsAdapter extends RecyclerView.Adapter { @@ -899,7 +771,7 @@ public class T2PComplianceActivity extends AppCompatActivity { if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -961,7 +833,7 @@ public class T2PComplianceActivity extends AppCompatActivity { if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -1021,4 +893,31 @@ public class T2PComplianceActivity extends AppCompatActivity { } } + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 471461a..1cb685a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -77,7 +77,6 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { }); try { - setContentView(R.layout.activity_category_wise_performance); toolbar = (Toolbar) findViewById(R.id.toolbar); recyclerView = (RecyclerView) findViewById(R.id.recyclerView); @@ -104,7 +103,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - + } catch (Resources.NotFoundException e) { e.printStackTrace(); } diff --git a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml index d10aa62..28bbad9 100644 --- a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml +++ b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml @@ -46,8 +46,8 @@ android:id="@+id/btn_is_present" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textOn="Yes" - android:textOff="No" + android:textOn="@string/yes" + android:textOff="@string/no" android:background="@drawable/toggle_selector_background" android:layout_centerInParent="true"/> diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 32156af..9c05e53 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -73,12 +73,12 @@ Promosyon Ürün Adı - X + MBQ Bulunurluk Örnek Fotoğraf Ürün Adı - X + Stock Önyüz Raf Payı Hedefi Raf Payi @@ -111,4 +111,11 @@ Planogram + + Stock + Ek Teşhir + Teşhir Türü + Fotoğraf + Ek Teşhir + \ No newline at end of file