Projects information

Chunk

Conflicting content
import com.azizhuss.arabicreshaper.ArabicShaping; import com.byagowi.common.Range; import com.byagowi.persiancalendar.entity.City; <<<<<<< HEAD import com.byagowi.persiancalendar.entity.Day; ======= import com.byagowi.persiancalendar.entity.Event; >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 import com.byagowi.persiancalendar.enums.Season; import com.byagowi.persiancalendar.locale.LocaleUtils; import com.byagowi.persiancalendar.service.AlarmReceiver;

Conflicting content

import com.azizhuss.arabicreshaper.ArabicShaping;
import com.byagowi.common.Range;
import com.byagowi.persiancalendar.entity.City;
<<<<<<< HEAD
import com.byagowi.persiancalendar.entity.Day;
=======
import com.byagowi.persiancalendar.entity.Event;
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
import com.byagowi.persiancalendar.enums.Season;
import com.byagowi.persiancalendar.locale.LocaleUtils;
import com.byagowi.persiancalendar.service.AlarmReceiver;

Solution content
import com.azizhuss.arabicreshaper.ArabicShaping; import com.byagowi.common.Range; import com.byagowi.persiancalendar.entity.City; import com.byagowi.persiancalendar.entity.Event; import com.byagowi.persiancalendar.enums.Season; import com.byagowi.persiancalendar.locale.LocaleUtils; import com.byagowi.persiancalendar.service.AlarmReceiver;

Solution content

import com.azizhuss.arabicreshaper.ArabicShaping;
import com.byagowi.common.Range;
import com.byagowi.persiancalendar.entity.City;
import com.byagowi.persiancalendar.entity.Event;
import com.byagowi.persiancalendar.enums.Season;
import com.byagowi.persiancalendar.locale.LocaleUtils;
import com.byagowi.persiancalendar.service.AlarmReceiver;

File
Utils.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
return myInstance; } <<<<<<< HEAD public String textShaper(String text) { return (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) ? ArabicShaping.shape(text) : text; ======= /** * Text shaping is a essential thing on supporting Arabic script text on older Android versions. * It converts normal Arabic character to their presentation forms according to their position * on the text. * * @param text Arabic string * @return Shaped text */ public static String shape(String text) { return (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) ? ArabicShaping.shape(text) : text; >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 } public String getString(String key) {

Conflicting content

        return myInstance;
    }

<<<<<<< HEAD
    public String textShaper(String text) {
        return (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) ? ArabicShaping.shape(text) : text;
=======
    /**
     * Text shaping is a essential thing on supporting Arabic script text on older Android versions.
     * It converts normal Arabic character to their presentation forms according to their position
     * on the text.
     * 
     * @param text Arabic string
     * @return Shaped text
     */
    public static String shape(String text) {
        return (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN)
                ? ArabicShaping.shape(text)
                : text;
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
    }

    public String getString(String key) {

Solution content
return myInstance; } /** * Text shaping is a essential thing on supporting Arabic script text on older Android versions. * It converts normal Arabic character to their presentation forms according to their position * on the text. * * @param text Arabic string * @return Shaped text */ public String shape(String text) { return (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) ? ArabicShaping.shape(text) : text; } public String getString(String key) {

Solution content

        return myInstance;
    }

    /**
     * Text shaping is a essential thing on supporting Arabic script text on older Android versions.
     * It converts normal Arabic character to their presentation forms according to their position
     * on the text.
     * 
     * @param text Arabic string
     * @return Shaped text
     */
    public String shape(String text) {
        return (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN)
                ? ArabicShaping.shape(text)
                : text;
    }

    public String getString(String key) {

File
Utils.java

Developer's decision
Manual

Kind of conflict
Comment
Method invocation
Method signature
Return statement
Variable

Chunk

Conflicting content
// textView.setLineSpacing(0f, 0.8f); } <<<<<<< HEAD public void prepareShapeTextView(TextView textView) { prepareTextView(textView); textView.setText(textShaper(textView.getText().toString())); ======= public void prepareShapeTextView(Context context, TextView textView) { prepareTextView(context, textView); textView.setText(shape(textView.getText().toString())); >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 } public void prepareShapePreference(PreferenceViewHolder holder) {

Conflicting content

        // textView.setLineSpacing(0f, 0.8f);
    }

<<<<<<< HEAD
    public void prepareShapeTextView(TextView textView) {
        prepareTextView(textView);
        textView.setText(textShaper(textView.getText().toString()));
=======
    public void prepareShapeTextView(Context context, TextView textView) {
        prepareTextView(context, textView);
        textView.setText(shape(textView.getText().toString()));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
    }

    public void prepareShapePreference(PreferenceViewHolder holder) {

Solution content
// textView.setLineSpacing(0f, 0.8f); } public void prepareShapeTextView(TextView textView) { prepareTextView(textView); textView.setText(shape(textView.getText().toString())); } public void prepareShapePreference(PreferenceViewHolder holder) {

Solution content

        // textView.setLineSpacing(0f, 0.8f);
    }

    public void prepareShapeTextView(TextView textView) {
        prepareTextView(textView);
        textView.setText(shape(textView.getText().toString()));
    }

    public void prepareShapePreference(PreferenceViewHolder holder) {

File
Utils.java

Developer's decision
Combination

Kind of conflict
Method invocation
Method signature

Chunk

Conflicting content
// See android.support.v7.preference.Preference#onBindViewHolder TextView titleView = (TextView) holder.findViewById(android.R.id.title); if (titleView != null) { <<<<<<< HEAD prepareShapeTextView((TextView) holder.findViewById(android.R.id.title)); } TextView summaryView = (TextView) holder.findViewById(android.R.id.title); if (titleView != null) { prepareShapeTextView((TextView) holder.findViewById(android.R.id.summary)); ======= prepareShapeTextView(context, titleView); } TextView summaryView = (TextView) holder.findViewById(android.R.id.summary); if (summaryView != null) { prepareShapeTextView(context, summaryView); >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 } }

Conflicting content

        // See android.support.v7.preference.Preference#onBindViewHolder
        TextView titleView = (TextView) holder.findViewById(android.R.id.title);
        if (titleView != null) {
<<<<<<< HEAD
            prepareShapeTextView((TextView) holder.findViewById(android.R.id.title));
        }
        TextView summaryView = (TextView) holder.findViewById(android.R.id.title);
        if (titleView != null) {
            prepareShapeTextView((TextView) holder.findViewById(android.R.id.summary));
=======
            prepareShapeTextView(context, titleView);
        }
        TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);
        if (summaryView != null) {
            prepareShapeTextView(context, summaryView);
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
        }
    }

Solution content
// See android.support.v7.preference.Preference#onBindViewHolder TextView titleView = (TextView) holder.findViewById(android.R.id.title); if (titleView != null) { prepareShapeTextView(titleView); } TextView summaryView = (TextView) holder.findViewById(android.R.id.summary); if (summaryView != null) { prepareShapeTextView(summaryView); } }

Solution content

        // See android.support.v7.preference.Preference#onBindViewHolder
        TextView titleView = (TextView) holder.findViewById(android.R.id.title);
        if (titleView != null) {
            prepareShapeTextView(titleView);
        }
        TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);
        if (summaryView != null) {
            prepareShapeTextView(summaryView);
        }
    }

File
Utils.java

Developer's decision
Manual

Kind of conflict
Cast expression
If statement
Method invocation
Variable

Chunk

Conflicting content
supportActionBar.setSubtitle(subtitleSpan); } <<<<<<< HEAD public CalculationMethod getCalculationMethod() { return CalculationMethod.valueOf(prefs.getString("PrayTimeMethod", "Jafari")); // Seems Iran is using Jafari method } public int getIslamicOffset() { return Integer.parseInt(prefs.getString("islamicOffset", "0")); } public Coordinate getCoordinate() { ======= public CalculationMethod getCalculationMethod(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); // It seems Iran is using Jafari method return CalculationMethod.valueOf(prefs.getString("PrayTimeMethod", "Jafari")); } public static int getIslamicOffset(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); return Integer.parseInt(prefs.getString("islamicOffset", "0")); } public Coordinate getCoordinate(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 String location = prefs.getString("Location", "CUSTOM"); if (!location.equals("CUSTOM")) { City city = getCityByKey(location);

Conflicting content

        supportActionBar.setSubtitle(subtitleSpan);
    }

<<<<<<< HEAD
    public CalculationMethod getCalculationMethod() {
        return CalculationMethod.valueOf(prefs.getString("PrayTimeMethod",
                "Jafari")); // Seems Iran is using Jafari method
    }

    public int getIslamicOffset() {
        return Integer.parseInt(prefs.getString("islamicOffset", "0"));
    }

    public Coordinate getCoordinate() {
=======
    public CalculationMethod getCalculationMethod(Context context) {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        // It seems Iran is using Jafari method
        return CalculationMethod.valueOf(prefs.getString("PrayTimeMethod", "Jafari"));
    }

    public static int getIslamicOffset(Context context) {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        return Integer.parseInt(prefs.getString("islamicOffset", "0"));
    }

    public Coordinate getCoordinate(Context context) {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
        String location = prefs.getString("Location", "CUSTOM");
        if (!location.equals("CUSTOM")) {
            City city = getCityByKey(location);

Solution content
supportActionBar.setSubtitle(subtitleSpan); } public CalculationMethod getCalculationMethod() { // It seems Iran is using Jafari method return CalculationMethod.valueOf(prefs.getString("PrayTimeMethod", "Jafari")); } public int getIslamicOffset() { return Integer.parseInt(prefs.getString("islamicOffset", "0")); } public Coordinate getCoordinate() { String location = prefs.getString("Location", "CUSTOM"); if (!location.equals("CUSTOM")) { City city = getCityByKey(location);

Solution content

        supportActionBar.setSubtitle(subtitleSpan);
    }

    public CalculationMethod getCalculationMethod() {
        // It seems Iran is using Jafari method
        return CalculationMethod.valueOf(prefs.getString("PrayTimeMethod", "Jafari"));
    }

    public int getIslamicOffset() {
        return Integer.parseInt(prefs.getString("islamicOffset", "0"));
    }

    public Coordinate getCoordinate() {
        String location = prefs.getString("Location", "CUSTOM");
        if (!location.equals("CUSTOM")) {
            City city = getCityByKey(location);

File
Utils.java

Developer's decision
Combination

Kind of conflict
Method declaration
Method invocation
Method signature
Variable

Chunk

Conflicting content
return prefs.getBoolean("PersianDigits", true) ? Constants.PERSIAN_DIGITS : Constants.ARABIC_DIGITS; } <<<<<<< HEAD public boolean isPersianDigitSelected(){ return prefs.getBoolean("PersianDigits", true); } public boolean clockIn24() { ======= public static boolean isPersianDigitSelected(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); return prefs.getBoolean("PersianDigits", true); } public boolean clockIn24(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 return prefs.getBoolean("WidgetIn24", true); }

Conflicting content

        return prefs.getBoolean("PersianDigits", true) ? Constants.PERSIAN_DIGITS : Constants.ARABIC_DIGITS;
    }

<<<<<<< HEAD
    public boolean isPersianDigitSelected(){
        return prefs.getBoolean("PersianDigits", true);
    }

    public boolean clockIn24() {
=======
    public static boolean isPersianDigitSelected(Context context) {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
        return prefs.getBoolean("PersianDigits", true);
    }

    public boolean clockIn24(Context context) {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
        return prefs.getBoolean("WidgetIn24", true);
    }

Solution content
return prefs.getBoolean("PersianDigits", true) ? Constants.PERSIAN_DIGITS : Constants.ARABIC_DIGITS; } public boolean isPersianDigitSelected(){ return prefs.getBoolean("PersianDigits", true); } public boolean clockIn24() { return prefs.getBoolean("WidgetIn24", true); }

Solution content

        return prefs.getBoolean("PersianDigits", true) ? Constants.PERSIAN_DIGITS : Constants.ARABIC_DIGITS;
    }

    public boolean isPersianDigitSelected(){
        return prefs.getBoolean("PersianDigits", true);
    }

    public boolean clockIn24() {
        return prefs.getBoolean("WidgetIn24", true);
    }

File
Utils.java

Developer's decision
Version 1

Kind of conflict
Method declaration
Method invocation
Method signature
Variable

Chunk

Conflicting content
Day day = new Day(); return DateConverter.civilToPersian(civilDate); } <<<<<<< HEAD public List getDays(int offset) { List days = new ArrayList<>(); PersianDate persianDate = getToday(); int month = persianDate.getMonth() - offset; month -= 1; int year = persianDate.getYear(); year = year + (month / 12); month = month % 12; if (month < 0) { year -= 1; month += 12; } month += 1; persianDate.setMonth(month); persianDate.setYear(year); persianDate.setDayOfMonth(1); char[] digits = preferredDigits(); int dayOfWeek = DateConverter.persianToCivil(persianDate) .getDayOfWeek() % 7; try { PersianDate today = getToday(); for (int i = 1; i <= 31; i++) { persianDate.setDayOfMonth(i); day.setNum(formatNumber(i, digits)); day.setDayOfWeek(dayOfWeek); String holidayTitle = getHolidayTitle(persianDate); if (holidayTitle != null \|\| dayOfWeek == 6) { day.setHoliday(true); } String eventTitle = getEventTitle(persianDate); if (!TextUtils.isEmpty(eventTitle) \|\| holidayTitle != null ) { day.setEvent(true); } day.setPersianDate(persianDate.clone()); if (persianDate.equals(today)) { day.setToday(true); } days.add(day); dayOfWeek++; if (dayOfWeek == 7) { dayOfWeek = 0; } } } catch (DayOutOfRangeException e) { // okay, it was expected } return days; } ======= >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 public Calendar makeCalendarFromDate(Date date, boolean iranTime) { Calendar calendar = Calendar.getInstance(); if (iranTime) {

Conflicting content

                Day day = new Day();

        return DateConverter.civilToPersian(civilDate);
    }

<<<<<<< HEAD
    public List getDays(int offset) {
        List days = new ArrayList<>();
        PersianDate persianDate = getToday();
        int month = persianDate.getMonth() - offset;
        month -= 1;
        int year = persianDate.getYear();
        year = year + (month / 12);
        month = month % 12;
        if (month < 0) {
            year -= 1;
            month += 12;
        }
        month += 1;
        persianDate.setMonth(month);
        persianDate.setYear(year);
        persianDate.setDayOfMonth(1);

        char[] digits = preferredDigits();

        int dayOfWeek = DateConverter.persianToCivil(persianDate)
                .getDayOfWeek() % 7;

        try {
            PersianDate today = getToday();
            for (int i = 1; i <= 31; i++) {
                persianDate.setDayOfMonth(i);

                day.setNum(formatNumber(i, digits));
                day.setDayOfWeek(dayOfWeek);

                String holidayTitle = getHolidayTitle(persianDate);
                if (holidayTitle != null || dayOfWeek == 6) {
                    day.setHoliday(true);
                }

                String eventTitle = getEventTitle(persianDate);
                if (!TextUtils.isEmpty(eventTitle) || holidayTitle != null ) {
                    day.setEvent(true);
                }

                day.setPersianDate(persianDate.clone());

                if (persianDate.equals(today)) {
                    day.setToday(true);
                }

                days.add(day);
                dayOfWeek++;
                if (dayOfWeek == 7) {
                    dayOfWeek = 0;
                }
            }
        } catch (DayOutOfRangeException e) {
            // okay, it was expected
        }

        return days;
    }

=======
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
    public Calendar makeCalendarFromDate(Date date, boolean iranTime) {
        Calendar calendar = Calendar.getInstance();
        if (iranTime) {

Solution content
return DateConverter.civilToPersian(civilDate); } public Calendar makeCalendarFromDate(Date date, boolean iranTime) { Calendar calendar = Calendar.getInstance(); if (iranTime) {

File
Utils.java

Developer's decision
Version 2

Kind of conflict
Method declaration

Chunk

Conflicting content
return getString(weekDayNameCode.toString()); } <<<<<<< HEAD public void quickToast(String message) { Toast.makeText(context, textShaper(message), Toast.LENGTH_SHORT).show(); ======= public void quickToast(String message, Context context) { Toast.makeText(context, shape(message), Toast.LENGTH_SHORT).show(); >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 } public int getDayIconResource(int day) {

Conflicting content

        return getString(weekDayNameCode.toString());
    }

<<<<<<< HEAD
    public void quickToast(String message) {
        Toast.makeText(context, textShaper(message), Toast.LENGTH_SHORT).show();
=======
    public void quickToast(String message, Context context) {
        Toast.makeText(context, shape(message), Toast.LENGTH_SHORT).show();
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
    }

    public int getDayIconResource(int day) {

Solution content
return getString(weekDayNameCode.toString()); } public void quickToast(String message) { Toast.makeText(context, shape(message), Toast.LENGTH_SHORT).show(); } public int getDayIconResource(int day) {

File
Utils.java

Developer's decision
Combination

Kind of conflict
Method invocation
Method signature

Chunk

Conflicting content
@Override public void onBindViewHolder(DrawerAdapter.ViewHolder holder, int position) { if (!isPositionHeader(position)) { <<<<<<< HEAD utils.prepareTextView(holder.itemTitle); holder.itemTitle.setText(utils.textShaper(drawerTitles[position - 1])); if (drawerSubtitles[position - 1].length() != 0) { holder.itemSubtitle.setVisibility(View.VISIBLE); utils.prepareTextView(holder.itemSubtitle); holder.itemSubtitle.setText(utils.textShaper(drawerSubtitles[position - 1])); ======= utils.prepareTextView(mainActivity, holder.itemTitle); holder.itemTitle.setText(Utils.shape(drawerTitles[position - 1])); if (drawerSubtitles[position - 1].length() != 0) { holder.itemSubtitle.setVisibility(View.VISIBLE); utils.prepareTextView(mainActivity, holder.itemSubtitle); holder.itemSubtitle.setText(Utils.shape(drawerSubtitles[position - 1])); >>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778 } else { holder.itemSubtitle.setVisibility(View.GONE); }

Conflicting content

    @Override
    public void onBindViewHolder(DrawerAdapter.ViewHolder holder, int position) {
        if (!isPositionHeader(position)) {
<<<<<<< HEAD
            utils.prepareTextView(holder.itemTitle);
            holder.itemTitle.setText(utils.textShaper(drawerTitles[position - 1]));
            if (drawerSubtitles[position - 1].length() != 0) {
                holder.itemSubtitle.setVisibility(View.VISIBLE);
                utils.prepareTextView(holder.itemSubtitle);
                holder.itemSubtitle.setText(utils.textShaper(drawerSubtitles[position - 1]));
=======
            utils.prepareTextView(mainActivity, holder.itemTitle);
            holder.itemTitle.setText(Utils.shape(drawerTitles[position - 1]));
            if (drawerSubtitles[position - 1].length() != 0) {
                holder.itemSubtitle.setVisibility(View.VISIBLE);
                utils.prepareTextView(mainActivity, holder.itemSubtitle);
                holder.itemSubtitle.setText(Utils.shape(drawerSubtitles[position - 1]));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
            } else {
                holder.itemSubtitle.setVisibility(View.GONE);
            }

Solution content

    @Override
    public void onBindViewHolder(DrawerAdapter.ViewHolder holder, int position) {
        if (!isPositionHeader(position)) {
            utils.prepareTextView(holder.itemTitle);
            holder.itemTitle.setText(utils.shape(drawerTitles[position - 1]));
            if (drawerSubtitles[position - 1].length() != 0) {
                holder.itemSubtitle.setVisibility(View.VISIBLE);
                utils.prepareTextView(holder.itemSubtitle);
                holder.itemSubtitle.setText(utils.shape(drawerSubtitles[position - 1]));
            } else {
                holder.itemSubtitle.setVisibility(View.GONE);
            }

File
DrawerAdapter.java

Developer's decision
Manual

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content

public class LocationAdapter extends RecyclerView.Adapter {
    private String locale;
<<<<<<< HEAD
    List cities;
    private Utils utils;
=======
    private Context context;
    List cities;
    private final Utils utils = Utils.getInstance();
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
    LocationPreferenceDialog locationPreferenceDialog;
    LayoutInflater layoutInflater;

Solution content

public class LocationAdapter extends RecyclerView.Adapter {
    private String locale;
    private List cities;
    private Utils utils;
    LocationPreferenceDialog locationPreferenceDialog;
    LayoutInflater layoutInflater;

File
LocationAdapter.java

Developer's decision
Manual

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content

        remoteViews1.setTextViewText(R.id.textPlaceholder1_1x1,
                utils.formatNumber(persian.getDayOfMonth(), digits));
        remoteViews1.setTextViewText(R.id.textPlaceholder2_1x1,
<<<<<<< HEAD
                utils.textShaper(utils.getMonthName(persian)));
=======
                Utils.shape(utils.getMonthName(persian)));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
        remoteViews1.setOnClickPendingIntent(R.id.widget_layout1x1,
                launchAppPendingIntent);
        manager.updateAppWidget(new ComponentName(context, Widget1x1.class),

Solution content

        remoteViews1.setTextViewText(R.id.textPlaceholder1_1x1,
                utils.formatNumber(persian.getDayOfMonth(), digits));
        remoteViews1.setTextViewText(R.id.textPlaceholder2_1x1,
                utils.shape(utils.getMonthName(persian)));
        remoteViews1.setOnClickPendingIntent(R.id.widget_layout1x1,
                launchAppPendingIntent);
        manager.updateAppWidget(new ComponentName(context, Widget1x1.class),

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        }

        remoteViews4.setTextViewText(R.id.textPlaceholder1_4x1,
<<<<<<< HEAD
                utils.textShaper(text1));
        remoteViews4.setTextViewText(R.id.textPlaceholder2_4x1,
                utils.textShaper(text2));
        remoteViews4.setTextViewText(R.id.textPlaceholder3_4x1,
                utils.textShaper(text3));
=======
                Utils.shape(text1));
        remoteViews4.setTextViewText(R.id.textPlaceholder2_4x1,
                Utils.shape(text2));
        remoteViews4.setTextViewText(R.id.textPlaceholder3_4x1,
                Utils.shape(text3));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778

        remoteViews4.setOnClickPendingIntent(R.id.widget_layout4x1,
                launchAppPendingIntent);

Solution content

        }

        remoteViews4.setTextViewText(R.id.textPlaceholder1_4x1,
                utils.shape(text1));
        remoteViews4.setTextViewText(R.id.textPlaceholder2_4x1,
                utils.shape(text2));
        remoteViews4.setTextViewText(R.id.textPlaceholder3_4x1,
                utils.shape(text3));
        remoteViews4.setOnClickPendingIntent(R.id.widget_layout4x1,
                launchAppPendingIntent);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        String owghat = utils.getNextOghatTime(currentClock, false);
        if (owghat != null) {
            remoteViews2.setTextViewText(R.id.owghat_2x2,
<<<<<<< HEAD
                    utils.textShaper(owghat));
=======
                    Utils.shape(owghat));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.GONE);

Solution content

        String owghat = utils.getNextOghatTime(currentClock, false);
        if (owghat != null) {
            remoteViews2.setTextViewText(R.id.owghat_2x2,
                    utils.shape(owghat));
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.GONE);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        }

        remoteViews2.setTextViewText(R.id.time_2x2,
<<<<<<< HEAD
                utils.textShaper(text1));
        remoteViews2.setTextViewText(R.id.date_2x2,
                utils.textShaper(text2));
=======
                Utils.shape(text1));
        remoteViews2.setTextViewText(R.id.date_2x2,
                Utils.shape(text2));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778

        remoteViews2.setOnClickPendingIntent(R.id.widget_layout2x2,
                launchAppPendingIntent);

Solution content

        }

        remoteViews2.setTextViewText(R.id.time_2x2,
                utils.shape(text1));
        remoteViews2.setTextViewText(R.id.date_2x2,
                utils.shape(text2));

        remoteViews2.setOnClickPendingIntent(R.id.widget_layout2x2,
                launchAppPendingIntent);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

                            .setSmallIcon(icon)
                            .setWhen(0)
                            .setContentIntent(launchAppPendingIntent)
<<<<<<< HEAD
                            .setContentText(utils.textShaper(body))
                            .setContentTitle(utils.textShaper(title))
=======
                            .setContentText(Utils.shape(body))
                            .setContentTitle(Utils.shape(title))
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
                            .build());
        } else {
            mNotificationManager.cancel(NOTIFICATION_ID);

Solution content

                            .setSmallIcon(icon)
                            .setWhen(0)
                            .setContentIntent(launchAppPendingIntent)
                            .setContentText(utils.shape(body))
                            .setContentTitle(utils.shape(title))
                            .build());
        } else {
            mNotificationManager.cancel(NOTIFICATION_ID);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        }

        mExtensionData = new ExtensionData().visible(true).icon(icon)
<<<<<<< HEAD
                .status(utils.textShaper(status))
                .expandedTitle(utils.textShaper(title))
                .expandedBody(utils.textShaper(body)).clickIntent(intent);
=======
                .status(Utils.shape(status))
                .expandedTitle(Utils.shape(title))
                .expandedBody(Utils.shape(body)).clickIntent(intent);
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
    }

Solution content
} mExtensionData = new ExtensionData().visible(true).icon(icon) .status(utils.shape(status)) .expandedTitle(utils.shape(title)) .expandedBody(utils.shape(body)).clickIntent(intent); }

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

        String owghat = utils.getNextOghatTime(currentClock, true);
        if (owghat != null) {
            remoteViews2.setTextViewText(R.id.owghat_2x2,
<<<<<<< HEAD
                    utils.textShaper(owghat));
=======
                    Utils.shape(owghat));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.GONE);

Solution content

        String owghat = utils.getNextOghatTime(currentClock, true);
        if (owghat != null) {
            remoteViews2.setTextViewText(R.id.owghat_2x2,
                    utils.shape(owghat));
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.owghat_2x2, View.GONE);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        if (!TextUtils.isEmpty(holidays)) {
            remoteViews2.setTextViewText(R.id.holiday_2x2,
<<<<<<< HEAD
                    utils.textShaper(holidays));
=======
                    Utils.shape(holidays));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
            remoteViews2.setViewVisibility(R.id.holiday_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.holiday_2x2, View.GONE);

Solution content

        if (!TextUtils.isEmpty(holidays)) {
            remoteViews2.setTextViewText(R.id.holiday_2x2,
                    utils.shape(holidays));
            remoteViews2.setViewVisibility(R.id.holiday_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.holiday_2x2, View.GONE);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        if (!TextUtils.isEmpty(events)) {
            remoteViews2.setTextViewText(R.id.event_2x2,
<<<<<<< HEAD
                    utils.textShaper(events));
=======
                    Utils.shape(events));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
            remoteViews2.setViewVisibility(R.id.event_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.event_2x2, View.GONE);

Solution content

        if (!TextUtils.isEmpty(events)) {
            remoteViews2.setTextViewText(R.id.event_2x2,
                    utils.shape(events));
            remoteViews2.setViewVisibility(R.id.event_2x2, View.VISIBLE);
        } else {
            remoteViews2.setViewVisibility(R.id.event_2x2, View.GONE);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        }

        remoteViews2.setTextViewText(R.id.time_2x2,
<<<<<<< HEAD
                utils.textShaper(text1));
        remoteViews2.setTextViewText(R.id.date_2x2,
                utils.textShaper(text2));
=======
                Utils.shape(text1));
        remoteViews2.setTextViewText(R.id.date_2x2,
                Utils.shape(text2));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778


        Intent intent = new Intent(context, MainActivity.class);

Solution content
} remoteViews2.setTextViewText(R.id.time_2x2, utils.shape(text1)); remoteViews2.setTextViewText(R.id.date_2x2, utils.shape(text2)); Intent intent = new Intent(context, MainActivity.class);

File
UpdateUtils.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        String cityName;
        String cityKey = prefs.getString(ApplicationPreferenceFragment.PREF_KEY_LOCATION, "");
        if (!TextUtils.isEmpty(cityKey)) {
<<<<<<< HEAD
            City city = utils.getCityByKey(cityKey);
=======
            City city = utils.getCityByKey(cityKey, this);
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
            cityName = prefs.getString("AppLanguage", "fa").equals("en") ? city.en : city.fa;
        } else {
            float latitude = prefs.getFloat(ApplicationPreferenceFragment.PREF_KEY_LATITUDE, 0);

Solution content

        String cityName;
        String cityKey = prefs.getString(ApplicationPreferenceFragment.PREF_KEY_LOCATION, "");
        if (!TextUtils.isEmpty(cityKey)) {
            City city = utils.getCityByKey(cityKey);
            cityName = prefs.getString("AppLanguage", "fa").equals("en") ? city.en : city.fa;
        } else {
            float latitude = prefs.getFloat(ApplicationPreferenceFragment.PREF_KEY_LATITUDE, 0);

File
AthanView.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

        String version = utils.programVersion();

        TextView versionTextView = (TextView) view.findViewById(R.id.version2);
<<<<<<< HEAD
        utils.prepareTextView(versionTextView);
        versionTextView.setText(utils.textShaper(getString(R.string.version)) + " " +
                utils.formatNumber(version, utils.preferredDigits()));
=======
        utils.prepareTextView(getActivity(), versionTextView);
        versionTextView.setText(utils.shape(getString(R.string.version)) + " " +
                Utils.formatNumber(version, utils.preferredDigits(getContext())));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778

        StringBuilder sb = new StringBuilder();

Solution content

        String version = utils.programVersion();

        TextView versionTextView = (TextView) view.findViewById(R.id.version2);
        utils.prepareTextView(versionTextView);
        versionTextView.setText(utils.shape(getString(R.string.version)) + " " +
                utils.formatNumber(version, utils.preferredDigits()));

        StringBuilder sb = new StringBuilder();

File
AboutFragment.java

Developer's decision
Combination

Kind of conflict
Method invocation

Chunk

Conflicting content

                + version
                + "\n"
                + "Copyright (C) 2012-2016  ebrahim@gnu.org "
<<<<<<< HEAD
                + utils.textShaper("ابراهیم بیاگوی")
=======
                + Utils.shape("ابراهیم بیاگوی")
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
                + "\n\n"
                + "This program is free software: you can redistribute it and/or modify "
                + "it under the terms of the GNU General Public License as published by "

Solution content

                + version
                + "\n"
                + "Copyright (C) 2012-2016  ebrahim@gnu.org "
                + utils.shape("ابراهیم بیاگوی")
                + "\n\n"
                + "This program is free software: you can redistribute it and/or modify "
                + "it under the terms of the GNU General Public License as published by "

File
AboutFragment.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

        if (location.equals("CUSTOM")) {
            utils.setActivityTitleAndSubtitle(getActivity(), getString(R.string.compass), "");
        } else {
<<<<<<< HEAD
            City city = utils.getCityByKey(location);
=======
            City city = utils.getCityByKey(location, context);
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
            utils.setActivityTitleAndSubtitle(getActivity(), getString(R.string.qibla_compass),
                    prefs.getString("AppLanguage", "fa").equals("en")
                            ? city.en

Solution content

        if (location.equals("CUSTOM")) {
            utils.setActivityTitleAndSubtitle(getActivity(), getString(R.string.compass), "");
        } else {
            City city = utils.getCityByKey(location);
            utils.setActivityTitleAndSubtitle(getActivity(), getString(R.string.qibla_compass),
                    prefs.getString("AppLanguage", "fa").equals("en")
                            ? city.en

File
CompassFragment.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

            sensorManager.registerListener(compassListener, sensor,
                    SensorManager.SENSOR_DELAY_FASTEST);
        } else {
<<<<<<< HEAD
            utils.quickToast(utils.textShaper(getString(R.string.compass_not_found)));
=======
            utils.quickToast(getString(R.string.compass_not_found), getContext());
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778
        }
        return view;
    }

Solution content
sensorManager.registerListener(compassListener, sensor, SensorManager.SENSOR_DELAY_FASTEST); } else { utils.quickToast(getString(R.string.compass_not_found)); } return view; }

File
CompassFragment.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content

            sb.append(" ");
            sb.append(calendarsTextList.get(0));

<<<<<<< HEAD
            date0.setText(utils.textShaper(sb.toString()));
            date1.setText(utils.textShaper(calendarsTextList.get(1)));
            date2.setText(utils.textShaper(calendarsTextList.get(2)));
=======
            date0.setText(Utils.shape(sb.toString()));
            date1.setText(Utils.shape(calendarsTextList.get(1)));
            date2.setText(Utils.shape(calendarsTextList.get(2)));
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778

        } catch (RuntimeException e) {
            moreDate.setVisibility(View.GONE);

Solution content

            sb.append(" ");
            sb.append(calendarsTextList.get(0));

            date0.setText(utils.shape(sb.toString()));
            date1.setText(utils.shape(calendarsTextList.get(1)));
            date2.setText(utils.shape(calendarsTextList.get(2)));

        } catch (RuntimeException e) {
            moreDate.setVisibility(View.GONE);

File
ConverterFragment.java

Developer's decision
Manual

Kind of conflict
Other

Chunk

Conflicting content

        utils = Utils.getInstance(getContext());
        View view = inflater.inflate(R.layout.fragment_month, container, false);
        offset = getArguments().getInt(Constants.OFFSET_ARGUMENT);
<<<<<<< HEAD
        List days = utils.getDays(offset);
        digits = utils.preferredDigits();
=======
        List days = getDays(getContext(), offset);
        digits = utils.preferredDigits(getActivity());
>>>>>>> d4519d937a3df0556ad211efa4bd73e62a8b9778

        AppCompatImageView prev = (AppCompatImageView) view.findViewById(R.id.prev);
        AppCompatImageView next = (AppCompatImageView) view.findViewById(R.id.next);

Solution content

        utils = Utils.getInstance(getContext());
        View view = inflater.inflate(R.layout.fragment_month, container, false);
        offset = getArguments().getInt(Constants.OFFSET_ARGUMENT);
        List days = getDays(offset);
        digits = utils.preferredDigits();

        AppCompatImageView prev = (AppCompatImageView) view.findViewById(R.id.prev);
        AppCompatImageView next = (AppCompatImageView) view.findViewById(R.id.next);

File
MonthFragment.java

Developer's decision
Manual

Kind of conflict
Attribute
Method invocation
Variable

Projects >> DroidPersianCalendar >>167f38ca572e09cfc000608d7a5002f48e7de46d