diff --git a/.travis.yml b/.travis.yml index 450daa9c..76923607 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: android: components: - tools - - build-tools-25.0.0 + - build-tools-25.0.1 - android-25 - extra-android-support - extra-google-google_play_services @@ -39,4 +39,4 @@ before_cache: cache: directories: - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ \ No newline at end of file + - $HOME/.gradle/wrapper/ diff --git a/app/build.gradle b/app/build.gradle index bfa70c49..8537540c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 25 - versionCode 38 - versionName '1.3.0' + versionCode 39 + versionName '1.3.1' applicationId 'org.glucosio.android' vectorDrawables.useSupportLibrary = true @@ -124,13 +124,13 @@ dependencies { compile 'com.wdullaer:materialdatetimepicker:2.4.0' compile 'com.github.PhilJay:MPAndroidChart:v2.2.5' compile 'uk.co.chrisjenx:calligraphy:2.2.0' - compile 'net.danlew:android.joda:2.9.4.1' - compile('com.mikepenz:materialdrawer:5.4.0@aar') { + compile 'net.danlew:android.joda:2.9.5.1' + compile('com.mikepenz:materialdrawer:5.8.1@aar') { transitive = true } // https://mvnrepository.com/artifact/org.apache.commons/commons-math3 - compile files('libs/commons-math3-3.6.jar') + compile files('libs/commons-math3-3.6.1.jar') // Butterknife compile "com.jakewharton:butterknife:${butterKnifeVer}" @@ -147,7 +147,12 @@ dependencies { exclude group: 'commons-logging', module: 'commons-logging' exclude group: 'org.apache.httpcomponents', module: 'httpclient' } - testCompile 'io.reactivex:rxjava:1.1.8' + testCompile 'io.reactivex:rxjava:1.2.4' + + testCompile "org.powermock:powermock-module-junit4:1.6.4" + testCompile "org.powermock:powermock-module-junit4-rule:1.6.4" + testCompile "org.powermock:powermock-api-mockito:1.6.4" + testCompile "org.powermock:powermock-classloading-xstream:1.6.4" // Testing libraries androidTestCompile 'com.android.support.test:rules:0.4.1' diff --git a/app/src/main/java/org/glucosio/android/activity/AddA1CActivity.java b/app/src/main/java/org/glucosio/android/activity/AddA1CActivity.java index a6963aa3..66f5ff63 100644 --- a/app/src/main/java/org/glucosio/android/activity/AddA1CActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/AddA1CActivity.java @@ -81,7 +81,6 @@ protected void onCreate(Bundle savedInstanceState) { this.getAddTimeTextView().setText(formatDateTime.getCurrentTime()); } - this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600); } @Override diff --git a/app/src/main/java/org/glucosio/android/activity/AddCholesterolActivity.java b/app/src/main/java/org/glucosio/android/activity/AddCholesterolActivity.java index 39879c04..23789f43 100644 --- a/app/src/main/java/org/glucosio/android/activity/AddCholesterolActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/AddCholesterolActivity.java @@ -83,7 +83,6 @@ protected void onCreate(Bundle savedInstanceState) { this.getAddTimeTextView().setText(formatDateTime.getCurrentTime()); } - this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600); } @Override diff --git a/app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java b/app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java index 7a0f1de6..16e8e5fe 100644 --- a/app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java @@ -39,6 +39,7 @@ import org.glucosio.android.db.GlucoseReading; import org.glucosio.android.presenter.AddGlucosePresenter; import org.glucosio.android.tools.FormatDateTime; +import org.glucosio.android.tools.GlucosioConverter; import org.glucosio.android.tools.LabelledSpinner; import java.text.DecimalFormat; @@ -124,7 +125,7 @@ public void onNothingChosen(View labelledSpinner, AdapterView adapterView) { if (presenter.getUnitMeasuerement().equals("mg/dL")) { readingString = String.valueOf(readingToEdit.getReading()); } else { - readingString = String.valueOf(presenter.convertToMmol(readingToEdit.getReading())); + readingString = String.valueOf(GlucosioConverter.glucoseToMmolL(readingToEdit.getReading())); } readingTextView.setText(readingString); @@ -151,7 +152,6 @@ public void onNothingChosen(View labelledSpinner, AdapterView adapterView) { presenter.updateSpinnerTypeTime(); } - this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600); // Check if activity was started from a NFC sensor if (getIntent().getExtras() != null) { diff --git a/app/src/main/java/org/glucosio/android/activity/AddKetoneActivity.java b/app/src/main/java/org/glucosio/android/activity/AddKetoneActivity.java index 445d3c0f..59fb860a 100644 --- a/app/src/main/java/org/glucosio/android/activity/AddKetoneActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/AddKetoneActivity.java @@ -74,9 +74,6 @@ protected void onCreate(Bundle savedInstanceState) { this.getAddDateTextView().setText(formatDateTime.getCurrentDate()); this.getAddTimeTextView().setText(formatDateTime.getCurrentTime()); } - - //TODO try to do this in AddReadingActivity.createFANViewAndListener - this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600); } @Override diff --git a/app/src/main/java/org/glucosio/android/activity/AddPressureActivity.java b/app/src/main/java/org/glucosio/android/activity/AddPressureActivity.java index 88efa944..9693308c 100644 --- a/app/src/main/java/org/glucosio/android/activity/AddPressureActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/AddPressureActivity.java @@ -83,7 +83,6 @@ protected void onCreate(Bundle savedInstanceState) { this.getAddTimeTextView().setText(formatDateTime.getCurrentTime()); } - this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600); } @Override diff --git a/app/src/main/java/org/glucosio/android/activity/AddReadingActivity.java b/app/src/main/java/org/glucosio/android/activity/AddReadingActivity.java index 81b41209..5ab8908e 100644 --- a/app/src/main/java/org/glucosio/android/activity/AddReadingActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/AddReadingActivity.java @@ -134,6 +134,7 @@ public void run() { AnimationTools.startCircularReveal(doneFAB); } }; + doneFAB.postDelayed(fabAnimationRunnable, 600); } protected abstract void dialogOnAddButtonPressed(); @@ -228,11 +229,4 @@ public void setAddDateTextView(TextView addDateTextView) { this.addDateTextView = addDateTextView; } - public FloatingActionButton getDoneFAB() { - return doneFAB; - } - - public Runnable getFabAnimationRunnable() { - return fabAnimationRunnable; - } } diff --git a/app/src/main/java/org/glucosio/android/activity/AddWeightActivity.java b/app/src/main/java/org/glucosio/android/activity/AddWeightActivity.java index d586963b..c0a5af03 100644 --- a/app/src/main/java/org/glucosio/android/activity/AddWeightActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/AddWeightActivity.java @@ -80,7 +80,6 @@ protected void onCreate(Bundle savedInstanceState) { this.getAddTimeTextView().setText(formatDateTime.getCurrentTime()); } - this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600); } @Override diff --git a/app/src/main/java/org/glucosio/android/activity/BackupActivity.java b/app/src/main/java/org/glucosio/android/activity/BackupActivity.java index 16f304cb..d9b8a2b0 100644 --- a/app/src/main/java/org/glucosio/android/activity/BackupActivity.java +++ b/app/src/main/java/org/glucosio/android/activity/BackupActivity.java @@ -246,9 +246,8 @@ public void onResult(@NonNull DriveApi.MetadataBufferResult result) { Date modifiedDate = metadata.getModifiedDate(); long backupSize = metadata.getFileSize(); backupsArray.add(new GlucosioBackup(driveId, modifiedDate, backupSize)); - backupListView.setAdapter(new BackupAdapter(activity, R.layout.preferences_backup, backupsArray)); } - + backupListView.setAdapter(new BackupAdapter(activity, R.layout.activity_backup_drive_restore_item, backupsArray)); } }); } @@ -499,4 +498,4 @@ public boolean onOptionsItemSelected(MenuItem item) { protected void attachBaseContext(Context newBase) { super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase)); } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/glucosio/android/adapter/A1cEstimateAdapter.java b/app/src/main/java/org/glucosio/android/adapter/A1cEstimateAdapter.java index 78dff61f..6bdd82f6 100644 --- a/app/src/main/java/org/glucosio/android/adapter/A1cEstimateAdapter.java +++ b/app/src/main/java/org/glucosio/android/adapter/A1cEstimateAdapter.java @@ -52,8 +52,7 @@ public View getView(int position, View convertView, ViewGroup parent) { String stringValue = p.getValue() + " %"; value.setText(stringValue); } else { - GlucosioConverter converter = new GlucosioConverter(); - String stringValue = converter.a1cNgspToIfcc(p.getValue()) + " mmol/mol"; + String stringValue = GlucosioConverter.a1cNgspToIfcc(p.getValue()) + " mmol/mol"; value.setText(stringValue); } } @@ -66,8 +65,7 @@ public View getView(int position, View convertView, ViewGroup parent) { if ("mg/dL".equals(db.getUser(1).getPreferred_unit())) { glucoseAverage.setText(getContext().getString(R.string.mg_dL_value, p.getGlucoseAverage())); } else { - GlucosioConverter converter = new GlucosioConverter(); - int mmol = converter.glucoseToMgDl(Double.parseDouble(p.getGlucoseAverage())); + int mmol = GlucosioConverter.glucoseToMgDl(Double.parseDouble(p.getGlucoseAverage())); String reading = NumberFormat.getInstance().format(mmol); glucoseAverage.setText(getContext().getString(R.string.mmol_L_value, reading)); } diff --git a/app/src/main/java/org/glucosio/android/adapter/BackupAdapter.java b/app/src/main/java/org/glucosio/android/adapter/BackupAdapter.java index 2e8f9e93..32a9ad33 100644 --- a/app/src/main/java/org/glucosio/android/adapter/BackupAdapter.java +++ b/app/src/main/java/org/glucosio/android/adapter/BackupAdapter.java @@ -4,6 +4,7 @@ import android.app.Dialog; import android.content.Context; import android.support.annotation.NonNull; +import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -25,25 +26,14 @@ public class BackupAdapter extends ArrayAdapter { private Context context; private FormatDateTime formatDateTime; - public BackupAdapter(Context context, int textViewResourceId) { - super(context, textViewResourceId); - } - public BackupAdapter(Context context, int resource, List items) { super(context, resource, items); this.context = context; formatDateTime = new FormatDateTime(context); } - private static String humanReadableByteCount(long bytes, boolean si) { - int unit = si ? 1000 : 1024; - if (bytes < unit) return bytes + " B"; - int exp = (int) (Math.log(bytes) / Math.log(unit)); - String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp - 1) + (si ? "" : "i"); - return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre); - } - @Override + @NonNull public View getView(int position, View convertView, @NonNull ViewGroup parent) { View v = convertView; @@ -54,48 +44,48 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) { } GlucosioBackup p = getItem(position); - final DriveId driveId = p.getDriveId(); - final String modified = formatDateTime.formatDate(p.getModifiedDate()); - final String size = humanReadableByteCount(p.getBackupSize(), true); - if (p != null) { + final DriveId driveId = p.getDriveId(); + final String modified = formatDateTime.formatDate(p.getModifiedDate()); + final String size = Formatter.formatFileSize(getContext(), p.getBackupSize()); + TextView modifiedTextView = (TextView) v.findViewById(R.id.item_history_time); TextView typeTextView = (TextView) v.findViewById(R.id.item_history_type); modifiedTextView.setText(modified); typeTextView.setText(size); - } - v.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // Show custom dialog - final Dialog dialog = new Dialog(context); - dialog.setContentView(R.layout.dialog_backup_restore); - TextView createdTextView = (TextView) dialog.findViewById(R.id.dialog_backup_restore_created); - TextView sizeTextView = (TextView) dialog.findViewById(R.id.dialog_backup_restore_size); - Button restoreButton = (Button) dialog.findViewById(R.id.dialog_backup_restore_button_restore); - Button cancelButton = (Button) dialog.findViewById(R.id.dialog_backup_restore_button_cancel); - - createdTextView.setText(modified); - sizeTextView.setText(size); - - restoreButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - ((BackupActivity) context).downloadFromDrive(driveId.asDriveFile()); - } - }); - - cancelButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dialog.dismiss(); - } - }); - - dialog.show(); - } - }); + v.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // Show custom dialog + final Dialog dialog = new Dialog(context); + dialog.setContentView(R.layout.dialog_backup_restore); + TextView createdTextView = (TextView) dialog.findViewById(R.id.dialog_backup_restore_created); + TextView sizeTextView = (TextView) dialog.findViewById(R.id.dialog_backup_restore_size); + Button restoreButton = (Button) dialog.findViewById(R.id.dialog_backup_restore_button_restore); + Button cancelButton = (Button) dialog.findViewById(R.id.dialog_backup_restore_button_cancel); + + createdTextView.setText(modified); + sizeTextView.setText(size); + + restoreButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((BackupActivity) context).downloadFromDrive(driveId.asDriveFile()); + } + }); + + cancelButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.dismiss(); + } + }); + + dialog.show(); + } + }); + } return v; } diff --git a/app/src/main/java/org/glucosio/android/adapter/HistoryAdapter.java b/app/src/main/java/org/glucosio/android/adapter/HistoryAdapter.java index d4052cad..effe40d6 100644 --- a/app/src/main/java/org/glucosio/android/adapter/HistoryAdapter.java +++ b/app/src/main/java/org/glucosio/android/adapter/HistoryAdapter.java @@ -58,7 +58,6 @@ public class HistoryAdapter extends RecyclerView.Adapter hb1acReadingArray; private ArrayList hb1acIdArray; private HistoryPresenter presenter; - private GlucosioConverter converter; private ArrayList glucoseIdArray; private ArrayList glucoseNotes; private ArrayList glucoseReadingArray; @@ -131,8 +130,6 @@ public HistoryAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, View v = LayoutInflater.from(parent.getContext()) .inflate(R.layout.fragment_history_item, parent, false); - converter = new GlucosioConverter(); - ViewHolder vh = new ViewHolder(v); return vh; } @@ -158,7 +155,7 @@ public void onBindViewHolder(ViewHolder holder, int position) { String reading = NumberFormat.getInstance().format(glucoseReading); readingTextView.setText(mContext.getString(R.string.mg_dL_value, reading)); } else { - double mmol = converter.glucoseToMmolL(glucoseReadingArray.get(position)); + double mmol = GlucosioConverter.glucoseToMmolL(glucoseReadingArray.get(position)); String reading = NumberFormat.getInstance().format(mmol); readingTextView.setText(mContext.getString(R.string.mmol_L_value, reading)); } @@ -178,8 +175,7 @@ public void onBindViewHolder(ViewHolder holder, int position) { if ("percentage".equals(presenter.getA1cUnitMeasurement())) { readingTextView.setText(hb1acReadingArray.get(position).toString() + " %"); } else { - GlucosioConverter converter = new GlucosioConverter(); - double ifcc = converter.a1cNgspToIfcc(hb1acReadingArray.get(position)); + double ifcc = GlucosioConverter.a1cNgspToIfcc(hb1acReadingArray.get(position)); String reading = NumberFormat.getInstance().format(ifcc); readingTextView.setText(mContext.getString(R.string.mmol_mol_value, reading)); } @@ -222,8 +218,7 @@ public void onBindViewHolder(ViewHolder holder, int position) { if ("kilograms".equals(presenter.getWeightUnitMeasurement())) { readingTextView.setText(weightReadingArray.get(position) + " kg"); } else { - GlucosioConverter converter = new GlucosioConverter(); - readingTextView.setText(converter.kgToLb(weightReadingArray.get(position)) + " lbs"); + readingTextView.setText(GlucosioConverter.kgToLb(weightReadingArray.get(position)) + " lbs"); } datetimeTextView.setText(presenter.convertDate(weightDataTime.get(position))); diff --git a/app/src/main/java/org/glucosio/android/db/DatabaseHandler.java b/app/src/main/java/org/glucosio/android/db/DatabaseHandler.java index acb87cf6..aef08098 100644 --- a/app/src/main/java/org/glucosio/android/db/DatabaseHandler.java +++ b/app/src/main/java/org/glucosio/android/db/DatabaseHandler.java @@ -289,7 +289,7 @@ public ArrayList getGlucoseReadings(Realm realm, Date from, Date return readingList; } - public GlucoseReading getGlucoseReading(long id) { + public GlucoseReading getGlucoseReadingById(long id) { return realm.where(GlucoseReading.class) .equalTo("id", id) .findFirst(); @@ -379,11 +379,6 @@ public Date getLastGlucoseDateTime() { return realm.where(GlucoseReading.class).maximumDate("created"); } - public GlucoseReading getGlucoseReadingById(long id) { - return getGlucoseReading(id); - } - - /* private ArrayList getGlucoseReadingsForLastMonthAsArray(){ Calendar calendar = Calendar.getInstance(); DateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); @@ -540,16 +535,12 @@ public void deleteHB1ACReading(HB1ACReading reading) { realm.commitTransaction(); } - public HB1ACReading getHB1ACReading(long id) { + public HB1ACReading getHB1ACReadingById(long id) { return realm.where(HB1ACReading.class) .equalTo("id", id) .findFirst(); } - public HB1ACReading getHB1ACReadingById(long id) { - return getHB1ACReading(id); - } - public void editHB1ACReading(long oldId, HB1ACReading reading) { // First delete the old reading deleteHB1ACReading(getHB1ACReadingById(oldId)); @@ -819,7 +810,7 @@ public void editWeightReading(long oldId, WeightReading reading) { addWeightReading(reading); } - public WeightReading getWeightReading(long id) { + public WeightReading getWeightReadingById(long id) { return realm.where(WeightReading.class) .equalTo("id", id) .findFirst(); @@ -888,10 +879,6 @@ public ArrayList getWeightReadingDateTimeAsArray() { return datetimeArray; } - public WeightReading getWeightReadingById(long id) { - return getWeightReading(id); - } - public void addCholesterolReading(CholesterolReading reading) { realm.beginTransaction(); reading.setId(getNextKey("cholesterol")); diff --git a/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java b/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java index 8eaec79e..2497ce99 100644 --- a/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java +++ b/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java @@ -50,7 +50,7 @@ import org.glucosio.android.activity.AddWeightActivity; import org.glucosio.android.activity.MainActivity; import org.glucosio.android.adapter.HistoryAdapter; -import org.glucosio.android.listener.RecyclerItemClickListener; +import org.glucosio.android.listener.ItemClickSupport; import org.glucosio.android.presenter.HistoryPresenter; import org.glucosio.android.tools.FormatDateTime; @@ -128,18 +128,13 @@ public void onNothingSelected(AdapterView parent) { } }); - mRecyclerView.addOnItemTouchListener(new RecyclerItemClickListener(getActivity(), mRecyclerView, new RecyclerItemClickListener.OnItemClickListener() { + ItemClickSupport.addTo(mRecyclerView).setOnItemLongClickListener(new ItemClickSupport.OnItemLongClickListener() { @Override - public void onItemClick(View view, int position) { - // Do nothing + public boolean onItemLongClicked(RecyclerView recyclerView, int position, View v) { + showBottomSheetDialog(v); + return true; } - - @Override - public void onItemLongClick(final View view, final int position) { - // if touch Glucose or weight item - showBottomSheetDialog(view); - } - })); + }); mRecyclerView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() { @Override diff --git a/app/src/main/java/org/glucosio/android/fragment/OverviewFragment.java b/app/src/main/java/org/glucosio/android/fragment/OverviewFragment.java index 7b55abdf..7ca97f3e 100644 --- a/app/src/main/java/org/glucosio/android/fragment/OverviewFragment.java +++ b/app/src/main/java/org/glucosio/android/fragment/OverviewFragment.java @@ -287,7 +287,6 @@ public void onNothingSelected(AdapterView parent) { xAxis.setPosition(XAxis.XAxisPosition.BOTTOM); xAxis.setTextColor(getResources().getColor(R.color.glucosio_text_light)); xAxis.setAvoidFirstLastClipping(true); - GlucosioConverter converter = new GlucosioConverter(); int minGlucoseValue = presenter.getGlucoseMinValue(); int maxGlucoseValue = presenter.getGlucoseMaxValue(); @@ -299,8 +298,8 @@ public void onNothingSelected(AdapterView parent) { ll1 = new LimitLine(minGlucoseValue); ll2 = new LimitLine(maxGlucoseValue); } else { - ll1 = new LimitLine((float) converter.glucoseToMmolL(maxGlucoseValue), getString(R.string.reading_high)); - ll2 = new LimitLine((float) converter.glucoseToMmolL(minGlucoseValue), getString(R.string.reading_low)); + ll1 = new LimitLine((float) GlucosioConverter.glucoseToMmolL(maxGlucoseValue), getString(R.string.reading_high)); + ll2 = new LimitLine((float) GlucosioConverter.glucoseToMmolL(minGlucoseValue), getString(R.string.reading_low)); } ll1.setLineWidth(0.8f); @@ -404,8 +403,6 @@ private void setData() { private LineData generateGlucoseData() { List xVals = new ArrayList<>(); List yVals = new ArrayList<>(); - GlucosioConverter converter = new GlucosioConverter(); - if (graphSpinnerRange.getSelectedItemPosition() == 0) { // Day view @@ -414,7 +411,7 @@ private LineData generateGlucoseData() { float val = Float.parseFloat(presenter.getGlucoseReadings().get(i).toString()); yVals.add(new Entry(val, i)); } else { - double val = converter.glucoseToMmolL(Double.parseDouble(presenter.getGlucoseReadings().get(i).toString())); + double val = GlucosioConverter.glucoseToMmolL(Double.parseDouble(presenter.getGlucoseReadings().get(i).toString())); float converted = (float) val; yVals.add(new Entry(converted, i)); } @@ -426,7 +423,7 @@ private LineData generateGlucoseData() { float val = Float.parseFloat(presenter.getGlucoseReadingsWeek().get(i) + ""); yVals.add(new Entry(val, i)); } else { - double val = converter.glucoseToMmolL(Double.parseDouble(presenter.getGlucoseReadingsWeek().get(i) + "")); + double val = GlucosioConverter.glucoseToMmolL(Double.parseDouble(presenter.getGlucoseReadingsWeek().get(i) + "")); float converted = (float) val; yVals.add(new Entry(converted, i)); } @@ -438,7 +435,7 @@ private LineData generateGlucoseData() { float val = Float.parseFloat(presenter.getGlucoseReadingsMonth().get(i) + ""); yVals.add(new Entry(val, i)); } else { - double val = converter.glucoseToMmolL(Double.parseDouble(presenter.getGlucoseReadingsMonth().get(i) + "")); + double val = GlucosioConverter.glucoseToMmolL(Double.parseDouble(presenter.getGlucoseReadingsMonth().get(i) + "")); float converted = (float) val; yVals.add(new Entry(converted, i)); } @@ -662,9 +659,8 @@ private void loadLastReading() { String reading = presenter.getLastReading(); lastReadingTextView.setText(getString(R.string.mg_dL_value, reading)); } else { - GlucosioConverter converter = new GlucosioConverter(); String mgdl = presenter.getLastReading(); - double mmol = converter.glucoseToMmolL(Double.parseDouble(mgdl)); + double mmol = GlucosioConverter.glucoseToMmolL(Double.parseDouble(mgdl)); String reading = NumberFormat.getInstance().format(mmol); lastReadingTextView.setText(getString(R.string.mmol_L_value, reading)); } diff --git a/app/src/main/java/org/glucosio/android/listener/ItemClickSupport.java b/app/src/main/java/org/glucosio/android/listener/ItemClickSupport.java new file mode 100644 index 00000000..c429dba2 --- /dev/null +++ b/app/src/main/java/org/glucosio/android/listener/ItemClickSupport.java @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2016 Glucosio Foundation + * + * This file is part of Glucosio. + * + * Glucosio is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * Glucosio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Glucosio. If not, see . + * + * + */ + +package org.glucosio.android.listener; + +import android.support.v7.widget.RecyclerView; +import android.view.View; + +import org.glucosio.android.R; + + +/** + * @see Getting your clicks on RecyclerView | Hugo Visser + */ +public class ItemClickSupport { + private final RecyclerView mRecyclerView; + private OnItemClickListener mOnItemClickListener; + private OnItemLongClickListener mOnItemLongClickListener; + private View.OnClickListener mOnClickListener = new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mOnItemClickListener != null) { + RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(v); + mOnItemClickListener.onItemClicked(mRecyclerView, holder.getAdapterPosition(), v); + } + } + }; + private View.OnLongClickListener mOnLongClickListener = new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + if (mOnItemLongClickListener != null) { + RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(v); + return mOnItemLongClickListener.onItemLongClicked(mRecyclerView, holder.getAdapterPosition(), v); + } + return false; + } + }; + private RecyclerView.OnChildAttachStateChangeListener mAttachListener + = new RecyclerView.OnChildAttachStateChangeListener() { + @Override + public void onChildViewAttachedToWindow(View view) { + if (mOnItemClickListener != null) { + view.setOnClickListener(mOnClickListener); + } + if (mOnItemLongClickListener != null) { + view.setOnLongClickListener(mOnLongClickListener); + } + } + + @Override + public void onChildViewDetachedFromWindow(View view) { + + } + }; + + private ItemClickSupport(RecyclerView recyclerView) { + mRecyclerView = recyclerView; + mRecyclerView.setTag(R.id.item_click_support, this); + mRecyclerView.addOnChildAttachStateChangeListener(mAttachListener); + } + + public static ItemClickSupport addTo(RecyclerView view) { + ItemClickSupport support = (ItemClickSupport) view.getTag(R.id.item_click_support); + if (support == null) { + support = new ItemClickSupport(view); + } + return support; + } + + public static ItemClickSupport removeFrom(RecyclerView view) { + ItemClickSupport support = (ItemClickSupport) view.getTag(R.id.item_click_support); + if (support != null) { + support.detach(view); + } + return support; + } + + public ItemClickSupport setOnItemClickListener(OnItemClickListener listener) { + mOnItemClickListener = listener; + return this; + } + + public ItemClickSupport setOnItemLongClickListener(OnItemLongClickListener listener) { + mOnItemLongClickListener = listener; + return this; + } + + private void detach(RecyclerView view) { + view.removeOnChildAttachStateChangeListener(mAttachListener); + view.setTag(R.id.item_click_support, null); + } + + interface OnItemClickListener { + + void onItemClicked(RecyclerView recyclerView, int position, View v); + } + + public interface OnItemLongClickListener { + + boolean onItemLongClicked(RecyclerView recyclerView, int position, View v); + } +} diff --git a/app/src/main/java/org/glucosio/android/listener/RecyclerItemClickListener.java b/app/src/main/java/org/glucosio/android/listener/RecyclerItemClickListener.java deleted file mode 100644 index bb6a885a..00000000 --- a/app/src/main/java/org/glucosio/android/listener/RecyclerItemClickListener.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2016 Glucosio Foundation - * - * This file is part of Glucosio. - * - * Glucosio is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * Glucosio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Glucosio. If not, see . - * - * - */ - -package org.glucosio.android.listener; - -import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.view.GestureDetector; -import android.view.MotionEvent; -import android.view.View; - -public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListener { - private OnItemClickListener mListener; - private GestureDetector mGestureDetector; - - public RecyclerItemClickListener(Context context, final RecyclerView recyclerView, OnItemClickListener listener) { - mListener = listener; - - mGestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() { - @Override - public boolean onSingleTapUp(MotionEvent e) { - return true; - } - - @Override - public void onLongPress(MotionEvent e) { - View childView = recyclerView.findChildViewUnder(e.getX(), e.getY()); - - if (childView != null && mListener != null) { - mListener.onItemLongClick(childView, recyclerView.getChildPosition(childView)); - } - } - }); - } - - @Override - public boolean onInterceptTouchEvent(RecyclerView view, MotionEvent e) { - View childView = view.findChildViewUnder(e.getX(), e.getY()); - - if (childView != null && mListener != null && mGestureDetector.onTouchEvent(e)) { - mListener.onItemClick(childView, view.getChildPosition(childView)); - } - - return false; - } - - @Override - public void onTouchEvent(RecyclerView view, MotionEvent motionEvent) { - } - - @Override - public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) { - } - - public static interface OnItemClickListener { - public void onItemClick(View view, int position); - - public void onItemLongClick(View view, int position); - } -} \ No newline at end of file diff --git a/app/src/main/java/org/glucosio/android/object/A1cEstimate.java b/app/src/main/java/org/glucosio/android/object/A1cEstimate.java index 4c780f41..2ef90c8c 100644 --- a/app/src/main/java/org/glucosio/android/object/A1cEstimate.java +++ b/app/src/main/java/org/glucosio/android/object/A1cEstimate.java @@ -30,7 +30,6 @@ public void setMonth(String month) { } public String getGlucoseAverage() { - GlucosioConverter conveter = new GlucosioConverter(); - return NumberFormat.getInstance().format(conveter.a1cToGlucose(value)); + return NumberFormat.getInstance().format(GlucosioConverter.a1cToGlucose(value)); } } diff --git a/app/src/main/java/org/glucosio/android/presenter/A1CCalculatorPresenter.java b/app/src/main/java/org/glucosio/android/presenter/A1CCalculatorPresenter.java index 03ea07fd..83262f03 100644 --- a/app/src/main/java/org/glucosio/android/presenter/A1CCalculatorPresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/A1CCalculatorPresenter.java @@ -45,19 +45,18 @@ public double calculateA1C(String glucose) { return 0; } - GlucosioConverter converter = new GlucosioConverter(); double convertedA1C; User user = dbHandler.getUser(1); if ("mg/dL".equals(user.getPreferred_unit())) { - convertedA1C = converter.glucoseToA1C(Double.parseDouble(glucose)); + convertedA1C = GlucosioConverter.glucoseToA1C(Double.parseDouble(glucose)); } else { - convertedA1C = converter.glucoseToA1C(converter.glucoseToMgDl(Double.parseDouble(glucose))); + convertedA1C = GlucosioConverter.glucoseToA1C(GlucosioConverter.glucoseToMgDl(Double.parseDouble(glucose))); } - if (!"percentage".equals(user.getPreferred_unit_a1c())) { - return converter.a1cNgspToIfcc(convertedA1C); - } else { + if ("percentage".equals(user.getPreferred_unit_a1c())) { return convertedA1C; + } else { + return GlucosioConverter.a1cNgspToIfcc(convertedA1C); } } @@ -75,8 +74,7 @@ public void saveA1C(double a1c) { User user = dbHandler.getUser(1); double finalA1c = a1c; if (!"percentage".equals(user.getPreferred_unit_a1c())) { - GlucosioConverter converter = new GlucosioConverter(); - finalA1c = converter.a1cIfccToNgsp(a1c); + finalA1c = GlucosioConverter.a1cIfccToNgsp(a1c); } HB1ACReading a1cReading = new HB1ACReading(finalA1c, new Date()); diff --git a/app/src/main/java/org/glucosio/android/presenter/AddA1CPresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddA1CPresenter.java index 2e584969..7bc3644e 100644 --- a/app/src/main/java/org/glucosio/android/presenter/AddA1CPresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/AddA1CPresenter.java @@ -67,8 +67,7 @@ private HB1ACReading generateHB1ACReading(String reading) { if ("percentage".equals(getA1CUnitMeasuerement())) { finalReading = Double.parseDouble(reading); } else { - GlucosioConverter converter = new GlucosioConverter(); - finalReading = converter.a1cIfccToNgsp(Double.parseDouble(reading)); + finalReading = GlucosioConverter.a1cIfccToNgsp(Double.parseDouble(reading)); } return new HB1ACReading(finalReading, finalDateTime); diff --git a/app/src/main/java/org/glucosio/android/presenter/AddGlucosePresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddGlucosePresenter.java index 5da5ac43..67881d08 100644 --- a/app/src/main/java/org/glucosio/android/presenter/AddGlucosePresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/AddGlucosePresenter.java @@ -43,13 +43,11 @@ public class AddGlucosePresenter extends AddReadingPresenter { private DatabaseHandler dB; private AddGlucoseActivity activity; private ReadingTools rTools; - private GlucosioConverter converter; public AddGlucosePresenter(AddGlucoseActivity addGlucoseActivity) { this.activity = addGlucoseActivity; dB = new DatabaseHandler(addGlucoseActivity.getApplicationContext()); rTools = new ReadingTools(); - converter = new GlucosioConverter(); } public void updateSpinnerTypeTime() { @@ -100,7 +98,7 @@ private boolean createReading(String type, String notes, long oldId, Date finalD if ("mg/dL".equals(getUnitMeasuerement())) { readingValue = number.intValue(); } else { - readingValue = converter.glucoseToMgDl(number.doubleValue()); + readingValue = GlucosioConverter.glucoseToMgDl(number.doubleValue()); } GlucoseReading gReading = new GlucoseReading(readingValue, type, finalDateTime, notes); if (oldId == UNKNOWN_ID) { @@ -111,10 +109,6 @@ private boolean createReading(String type, String notes, long oldId, Date finalD return isReadingAdded; } - public double convertToMmol(int mgDl) { - return converter.glucoseToMmolL(mgDl); - } - public Integer retrieveSpinnerID(String measuredTypeText, List measuredTypelist) { int measuredId = 0; boolean isFound = false; diff --git a/app/src/main/java/org/glucosio/android/presenter/AddReadingPresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddReadingPresenter.java index 0ce92d18..4d6780be 100644 --- a/app/src/main/java/org/glucosio/android/presenter/AddReadingPresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/AddReadingPresenter.java @@ -17,19 +17,6 @@ public class AddReadingPresenter { private String readingHour; private String readingMinute; - public void setReadingTimeNow() { - DateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - Date formatted = Calendar.getInstance().getTime(); - - SplitDateTime addSplitDateTime = new SplitDateTime(formatted, inputFormat); - - this.readingYear = addSplitDateTime.getYear(); - this.readingMonth = addSplitDateTime.getMonth(); - this.readingDay = addSplitDateTime.getDay(); - this.readingHour = addSplitDateTime.getHour(); - this.readingMinute = addSplitDateTime.getMinute(); - } - public void updateReadingSplitDateTime(Date readingDate) { DateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SplitDateTime splitDateTime = new SplitDateTime(readingDate, inputFormat); @@ -40,10 +27,9 @@ public void updateReadingSplitDateTime(Date readingDate) { this.readingMonth = splitDateTime.getMonth(); } - public Date getReadingTime() { - Calendar cal = Calendar.getInstance(); - cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth) - 1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute)); - return cal.getTime(); + public void setReadingTimeNow() { + Date formatted = new Date(); + updateReadingSplitDateTime(formatted); } public Calendar getReadingCal() { @@ -52,6 +38,10 @@ public Calendar getReadingCal() { return cal; } + public Date getReadingTime() { + return getReadingCal().getTime(); + } + public String getReadingYear() { return readingYear; } diff --git a/app/src/main/java/org/glucosio/android/presenter/AddWeightPresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddWeightPresenter.java index 566119a1..457b91f9 100644 --- a/app/src/main/java/org/glucosio/android/presenter/AddWeightPresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/AddWeightPresenter.java @@ -69,8 +69,7 @@ private WeightReading generateWeightReading(String reading) { if ("kilograms".equals(getWeightUnitMeasuerement())) { finalReading = Integer.parseInt(reading); } else { - GlucosioConverter converter = new GlucosioConverter(); - finalReading = converter.lbToKg(Integer.parseInt(reading)); + finalReading = GlucosioConverter.lbToKg(Integer.parseInt(reading)); } return new WeightReading(finalReading, finalDateTime); diff --git a/app/src/main/java/org/glucosio/android/presenter/ExportPresenter.java b/app/src/main/java/org/glucosio/android/presenter/ExportPresenter.java index 1a5120ff..ac9ab82e 100644 --- a/app/src/main/java/org/glucosio/android/presenter/ExportPresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/ExportPresenter.java @@ -105,7 +105,7 @@ protected String doInBackground(Void... params) { if (dirExists()) { Log.i("glucosio", "Dir exists"); - return ReadingToCSV.createCSVFile(mActivity, realm, readings, preferredUnit); + return new ReadingToCSV(mActivity, preferredUnit).createCSVFile(realm, readings); } else { Log.i("glucosio", "Dir NOT exists"); return null; diff --git a/app/src/main/java/org/glucosio/android/presenter/HistoryPresenter.java b/app/src/main/java/org/glucosio/android/presenter/HistoryPresenter.java index dc46ba5b..a8c43471 100644 --- a/app/src/main/java/org/glucosio/android/presenter/HistoryPresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/HistoryPresenter.java @@ -48,12 +48,12 @@ public void onDeleteClicked(long idToDelete, int metricID) { switch (metricID) { // Glucose case 0: - dB.deleteGlucoseReading(dB.getGlucoseReading(idToDelete)); + dB.deleteGlucoseReading(dB.getGlucoseReadingById(idToDelete)); fragment.reloadFragmentAdapter(); break; // HB1AC case 1: - dB.deleteHB1ACReading(dB.getHB1ACReading(idToDelete)); + dB.deleteHB1ACReading(dB.getHB1ACReadingById(idToDelete)); fragment.reloadFragmentAdapter(); break; // Cholesterol @@ -73,7 +73,7 @@ public void onDeleteClicked(long idToDelete, int metricID) { break; // Weight case 5: - dB.deleteWeightReading(dB.getWeightReading(idToDelete)); + dB.deleteWeightReading(dB.getWeightReadingById(idToDelete)); fragment.reloadFragmentAdapter(); break; default: diff --git a/app/src/main/java/org/glucosio/android/presenter/OverviewPresenter.java b/app/src/main/java/org/glucosio/android/presenter/OverviewPresenter.java index 75dcc63e..112e0e91 100644 --- a/app/src/main/java/org/glucosio/android/presenter/OverviewPresenter.java +++ b/app/src/main/java/org/glucosio/android/presenter/OverviewPresenter.java @@ -86,11 +86,10 @@ public String convertDate(String date) { public String getHB1AC() { // Check if last month is available first if (getGlucoseReadingsMonth().size() > 1) { - GlucosioConverter converter = new GlucosioConverter(); if ("percentage".equals(dB.getUser(1).getPreferred_unit_a1c())) { - return converter.glucoseToA1C(getGlucoseReadingsMonth().get(getGlucoseReadingsMonth().size() - 2)) + " %"; + return GlucosioConverter.glucoseToA1C(getGlucoseReadingsMonth().get(getGlucoseReadingsMonth().size() - 2)) + " %"; } else { - return converter.a1cNgspToIfcc(converter.glucoseToA1C(getGlucoseReadingsMonth().get(getGlucoseReadingsMonth().size() - 2))) + " mmol/mol"; + return GlucosioConverter.a1cNgspToIfcc(GlucosioConverter.glucoseToA1C(getGlucoseReadingsMonth().get(getGlucoseReadingsMonth().size() - 2))) + " mmol/mol"; } } else { return view.getString(R.string.overview_hb1ac_error_no_data); @@ -102,12 +101,11 @@ public boolean isA1cAvailable(int depth) { } public ArrayList getA1cEstimateList() { - GlucosioConverter converter = new GlucosioConverter(); ArrayList a1cEstimateList = new ArrayList<>(); // We don't take this month because A1C is incomplete for (int i = 0; i < getGlucoseReadingsMonth().size() - 1; i++) { - double value = converter.glucoseToA1C(getGlucoseReadingsMonth().get(i)); + double value = GlucosioConverter.glucoseToA1C(getGlucoseReadingsMonth().get(i)); String month = convertDateToMonth(getGlucoseDatetimeMonth().get(i)); a1cEstimateList.add(new A1cEstimate(value, month)); } diff --git a/app/src/main/java/org/glucosio/android/tools/FormatDateTime.java b/app/src/main/java/org/glucosio/android/tools/FormatDateTime.java index c12c9d62..49f47ac2 100644 --- a/app/src/main/java/org/glucosio/android/tools/FormatDateTime.java +++ b/app/src/main/java/org/glucosio/android/tools/FormatDateTime.java @@ -114,23 +114,13 @@ public String convertDate(String datetime) { return finalData + ""; } - public String convertRawDate(String datetime) { - DateFormat inputFormat = new SimpleDateFormat("EEE MMM d HH:mm:ss zzz yyyy"); + public String convertRawDate(Date datetime) { DateFormat finalDataFormat = DateFormat.getDateInstance(DateFormat.SHORT); - Date parsed = null; - try { - parsed = inputFormat.parse(datetime); - } catch (ParseException e) { - reportToFirebase(e); - e.printStackTrace(); - } - String finalData = finalDataFormat.format(parsed); - return finalData + ""; + return finalDataFormat.format(datetime); } - public String convertRawTime(String datetime) { - DateFormat inputFormat = new SimpleDateFormat("EEE MMM d HH:mm:ss zzz yyyy"); + public String convertRawTime(Date datetime) { DateFormat finalTimeFormat; if (android.text.format.DateFormat.is24HourFormat(context)) { @@ -139,15 +129,7 @@ public String convertRawTime(String datetime) { finalTimeFormat = new SimpleDateFormat("hh:mm a"); } - Date parsed = null; - try { - parsed = inputFormat.parse(datetime); - } catch (ParseException e) { - reportToFirebase(e); - e.printStackTrace(); - } - String finalTime = finalTimeFormat.format(parsed); - return finalTime + ""; + return finalTimeFormat.format(datetime); } public String getCurrentTime() { diff --git a/app/src/main/java/org/glucosio/android/tools/GlucosioConverter.java b/app/src/main/java/org/glucosio/android/tools/GlucosioConverter.java index 1b66e61a..82b15a56 100644 --- a/app/src/main/java/org/glucosio/android/tools/GlucosioConverter.java +++ b/app/src/main/java/org/glucosio/android/tools/GlucosioConverter.java @@ -23,7 +23,9 @@ import java.math.BigDecimal; import java.math.RoundingMode; -public class GlucosioConverter { +public final class GlucosioConverter { + private GlucosioConverter(){} + public static double round(double value, int places) { if (places < 0) throw new IllegalArgumentException(); @@ -32,44 +34,44 @@ public static double round(double value, int places) { return bd.doubleValue(); } - public int glucoseToMgDl(double mmolL) { + public static int glucoseToMgDl(double mmolL) { double converted = mmolL * 18; return (int) converted; } - public double glucoseToMmolL(double mgDl) { + public static double glucoseToMmolL(double mgDl) { return round(mgDl / 18.0, 1); } - public double glucoseToA1C(double mgDl) { + public static double glucoseToA1C(double mgDl) { // A1C = (Average glucose + 46.7) / 28.7 return round((mgDl + 46.7) / 28.7, 2); } - public double a1cToGlucose(double a1c) { + public static double a1cToGlucose(double a1c) { // Average glucose = (A1C * 28.7) -46.7 return round((a1c * 28.7) - 46.7, 2); } - public int kgToLb(int kg) { + public static int kgToLb(int kg) { Double d = kg * 2.20462; return d.intValue(); } - public int lbToKg(int lb) { + public static int lbToKg(int lb) { Double d = lb / 2.20462; return d.intValue(); } - public double a1cNgspToIfcc(double ngsp) { + public static double a1cNgspToIfcc(double ngsp) { // percentage to mmol/mol // [NGSP - 2.152] / 0.09148 return round((ngsp - 2.152) / 0.09148, 2); } - public double a1cIfccToNgsp(double ifcc) { + public static double a1cIfccToNgsp(double ifcc) { // mmol/mol to percentage // [0.09148 * IFCC] + 2.152 return round((0.09148 * ifcc) + 2.152, 2); } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/glucosio/android/tools/ReadingToCSV.java b/app/src/main/java/org/glucosio/android/tools/ReadingToCSV.java index 958bcbe3..79bd2a3c 100644 --- a/app/src/main/java/org/glucosio/android/tools/ReadingToCSV.java +++ b/app/src/main/java/org/glucosio/android/tools/ReadingToCSV.java @@ -21,6 +21,7 @@ package org.glucosio.android.tools; import android.content.Context; +import android.content.res.Resources; import android.os.Environment; import android.util.Log; @@ -29,6 +30,7 @@ import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStreamWriter; import java.util.List; @@ -36,95 +38,95 @@ public final class ReadingToCSV { - public static String createCSVFile(Context context, Realm realm, final List readings, String um) { - try { - final File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/glucosio", "glucosio_export_ " + System.currentTimeMillis() / 1000 + ".csv"); - final File sd = Environment.getExternalStorageDirectory(); - if (sd.canWrite()) { - FileOutputStream fileOutputStream = new FileOutputStream(file); - OutputStreamWriter osw = new OutputStreamWriter(fileOutputStream); - - // CSV Structure - // Date | Time | Concentration | Unit | Measured | Notes - osw.append(context.getResources().getString(R.string.dialog_add_date)); - osw.append(','); - - osw.append(context.getResources().getString(R.string.dialog_add_time)); - osw.append(','); - - osw.append(context.getResources().getString(R.string.dialog_add_concentration)); - osw.append(','); - - osw.append(context.getResources().getString(R.string.helloactivity_spinner_preferred_glucose_unit)); - osw.append(','); - - osw.append(context.getResources().getString(R.string.dialog_add_measured)); - osw.append(','); - - osw.append(context.getResources().getString(R.string.dialog_add_notes)); - osw.append('\n'); - - - FormatDateTime dateTool = new FormatDateTime(context); - - // Concentration | Measured | Date | Time | Notes | Unit of Measurement - if ("mg/dL".equals(um)) { - for (int i = 0; i < readings.size(); i++) { - GlucoseReading reading = readings.get(i); - osw.append(dateTool.convertRawDate(reading.getCreated() + "")); - osw.append(','); - - osw.append(dateTool.convertRawTime(reading.getCreated() + "")); - osw.append(','); - - osw.append(String.valueOf(reading.getReading())); - osw.append(','); - - osw.append("mg/dL"); - osw.append(','); + private final Context context; + private final String um; + private final FormatDateTime dateTool; - osw.append(String.valueOf(reading.getReading_type())); - osw.append(','); + public ReadingToCSV(Context context, String um) { + this.context = context; + this.um = um; - osw.append(reading.getNotes()); - osw.append('\n'); - - } - } else { - GlucosioConverter converter = new GlucosioConverter(); - - for (int i = 0; i < readings.size(); i++) { - GlucoseReading reading = readings.get(i); - osw.append(dateTool.convertRawDate(reading.getCreated() + "")); - osw.append(','); - - osw.append(dateTool.convertRawTime(reading.getCreated() + "")); - osw.append(','); - - osw.append(converter.glucoseToMmolL(reading.getReading()) + ""); - osw.append(','); - - osw.append("mmol/L"); - osw.append(','); - - osw.append(reading.getReading_type() + ""); - osw.append(','); + this.dateTool = new FormatDateTime(context); + } - osw.append(reading.getNotes()); - osw.append('\n'); + public String createCSVFile(Realm realm, final List readings) { + try { + File file = null; + final File sd = Environment.getExternalStorageDirectory(); + if (sd.canWrite()) { + file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/glucosio", "glucosio_export_" + System.currentTimeMillis() / 1000 + ".csv"); + + FileOutputStream fileOutputStream = null; + OutputStreamWriter osw = null; + + try { + fileOutputStream = new FileOutputStream(file); + osw = new OutputStreamWriter(fileOutputStream); + + // CSV Structure + // Date | Time | Concentration | Unit | Measured | Notes + final Resources resources = this.context.getResources(); + writeLine(osw, + resources.getString(R.string.dialog_add_date), + resources.getString(R.string.dialog_add_time), + resources.getString(R.string.dialog_add_concentration), + resources.getString(R.string.helloactivity_spinner_preferred_glucose_unit), + resources.getString(R.string.dialog_add_measured), + resources.getString(R.string.dialog_add_notes) + ); + + // Concentration | Measured | Date | Time | Notes | Unit of Measurement + if ("mg/dL".equals(um)) { + for (int i = 0; i < readings.size(); i++) { + GlucoseReading reading = readings.get(i); + + writeLine(osw, + this.dateTool.convertRawDate(reading.getCreated()), + this.dateTool.convertRawTime(reading.getCreated()), + String.valueOf(reading.getReading()), + "mg/dL", + String.valueOf(reading.getReading_type()), + reading.getNotes() + ); + + } + } else { + for (int i = 0; i < readings.size(); i++) { + GlucoseReading reading = readings.get(i); + + writeLine(osw, + this.dateTool.convertRawDate(reading.getCreated()), + this.dateTool.convertRawTime(reading.getCreated()), + GlucosioConverter.glucoseToMmolL(reading.getReading()) + "", + "mmol/L", + reading.getReading_type() + "", + reading.getNotes() + ); + } } + osw.flush(); + } catch (Exception e) { + Log.e("Glucosio", "Error exporting readings", e); + } finally { + if (osw != null) osw.close(); + if (fileOutputStream != null) fileOutputStream.close(); } - osw.flush(); - osw.close(); Log.i("Glucosio", "Done exporting readings"); } realm.close(); - return file.getPath(); + return file == null ? null : file.getPath(); } catch (Exception e) { realm.close(); e.printStackTrace(); return null; } } + + private void writeLine(OutputStreamWriter osw, String... values) throws IOException { + for (int i = 0; i < values.length; i++) { + osw.append(values[i]); + osw.append(i == values.length - 1 ? '\n' : ','); + } + } } diff --git a/app/src/main/res/values-aa-rER/strings.xml b/app/src/main/res/values-aa-rER/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-aa-rER/strings.xml +++ b/app/src/main/res/values-aa-rER/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ach-rUG/strings.xml b/app/src/main/res/values-ach-rUG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ach-rUG/strings.xml +++ b/app/src/main/res/values-ach-rUG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ae-rIR/strings.xml b/app/src/main/res/values-ae-rIR/strings.xml index 8e1c8646..467ce04f 100644 --- a/app/src/main/res/values-ae-rIR/strings.xml +++ b/app/src/main/res/values-ae-rIR/strings.xml @@ -95,9 +95,14 @@ بروزرسانی همین حالا متوجه شدم بروزرسانی وزن - ارسال بازخورد + + + + + + diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ak-rGH/strings.xml b/app/src/main/res/values-ak-rGH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ak-rGH/strings.xml +++ b/app/src/main/res/values-ak-rGH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-am-rET/strings.xml b/app/src/main/res/values-am-rET/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-am-rET/strings.xml +++ b/app/src/main/res/values-am-rET/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-an-rES/strings.xml b/app/src/main/res/values-an-rES/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-an-rES/strings.xml +++ b/app/src/main/res/values-an-rES/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 76e5dc45..5aa75b5f 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -136,7 +136,6 @@ جلوكوسيو يأتي بفئات افتراضية لإدخال الجلوكوز ولكن يمكنك إنشاء فئات مخصصة في الإعدادات بحيث تتطابق مع احتياجاتك الخاصة. تردد هنا عدة مرات مساعد جلوكوسيو يوفر نصائح عدة ، لذلك قم بالتردد هنا لتتعرف على إجراءات يمكنك اتخاذها لتحسين تجربة جلوكوسيو ونصائح مفيدة أخرى. - إرسال ملاحظات إذا كان لديك اي مشكلة تقنية أو اقتراحات حول جلوكوسيو نحن نشجعكم على ارساله من قائمة الإعدادات من أجل مساعدتنا على تحسين جلوكوسيو. إضافة قراءة تأكد من إضافة قراءات السكر بانتظام حتى يمكننا مساعدتك على تتبع مستويات السكر الخاص بك مع الوقت. @@ -198,6 +197,12 @@ المصارعة المشي لمسافات طويلة (تجوال) أعمال الحديقة المنزلية + + + + + + الكربوهيدرات: البروتين: diff --git a/app/src/main/res/values-arn-rCL/strings.xml b/app/src/main/res/values-arn-rCL/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-arn-rCL/strings.xml +++ b/app/src/main/res/values-arn-rCL/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-as-rIN/strings.xml b/app/src/main/res/values-as-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-as-rIN/strings.xml +++ b/app/src/main/res/values-as-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ast-rES/strings.xml b/app/src/main/res/values-ast-rES/strings.xml index 5cc62b63..e5e3dded 100644 --- a/app/src/main/res/values-ast-rES/strings.xml +++ b/app/src/main/res/values-ast-rES/strings.xml @@ -127,7 +127,6 @@ Glucosio vien con estayes predeterminaes pa la entrada de glucosa pero pues crear estayes personalizaes nos axustes pa concasar coles tos necesidaes úniques. Compruébalo equí davezu L\'asistente Glucosio apurre conseyos regulaes y siguirá ameyorando, asina qu\'equí comprueba siempres les aiciones que pues tomar p\'ameyorar la to esperiencia Glucosio y pa otros conseyos útiles. - Unvia feedback Si alcuentres cualesquier torga téunica o tienes feedback tocante a Glucosio encamentámoste unvialo nel menú d\'axustes p\'ayudamos a ameyorar Glucosio. Amiesta una llectura Asegúrate d\'amestar davezu los tos niveles de glucosa nel sangre pa qu\'asina podamos siguilos nel tiempu. @@ -176,6 +175,12 @@ Llucha llibre Senderismu Trabayu de campu + + + + + + Carbohidratos: Proteines: @@ -242,6 +247,5 @@ mmol/mol mmol/L Recordatorios - ¡Hora de rexistrar el to nivel de glucosa! Nun s\'afitaron recordatorios. Amiesta nuevos equí. diff --git a/app/src/main/res/values-av-rDA/strings.xml b/app/src/main/res/values-av-rDA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-av-rDA/strings.xml +++ b/app/src/main/res/values-av-rDA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ay-rBO/strings.xml b/app/src/main/res/values-ay-rBO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ay-rBO/strings.xml +++ b/app/src/main/res/values-ay-rBO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml index b9b1354e..23038f8f 100644 --- a/app/src/main/res/values-az-rAZ/strings.xml +++ b/app/src/main/res/values-az-rAZ/strings.xml @@ -22,9 +22,11 @@ Nizamlamalar Əks əlaqə + Dostunu dəvət et Ön baxış Tarix İp ucları + Yeni məlumat əlavə et Salam. Salam. İstifadə şərtləri. @@ -39,6 +41,14 @@ Diyabet tipi Tip 1 Tip 2 + Hamiləlik + LADA + Üstünlük verilən qlükoza vahidi + Üstünlük verilən HbA1c vahidi + faiz + Üstünlük verilən çəki vahidi + kiloqram + funt Araştırma üçün anonim məlumat göndər. Bu seçimləri sonra dəyişə bilərsiniz. Növbəti @@ -55,7 +65,10 @@ Nahardan sonra Şam yeməyindən əvvəl Şam yeməyindən sonra + Məzə + Yatmaq vaxtı Gecə + Aclıq qlükozası Yenidən yoxla Digər LƏĞV ET @@ -73,7 +86,9 @@ Gün Həftə Haqqında + Bu xüsusiyyətlər test edilir və tam çalışmaya bilər çünki istifadəçilərin test etməsi üçündür. Bizə geri bildiriş göndərmək üçün telefonu silkələməyi unutmayın. Versiya + Yaxında... İstifadə şərtləri Tip Çəki @@ -108,6 +123,8 @@ Köməkçi İndi yenilə OLDU, ANLADIM + GERİ BİLDİRİŞ GÖNDƏR + CANLI SÖHBƏT OXUMA ƏLAVƏ ET İNDİ SINA Çəkinizi yeniləyin @@ -118,18 +135,184 @@ Glucosio, standart olaraq qlükoza kateqoriyalara bölünmüş halda gəlir, amma siz nizamlamalarda şəxsi kateqoriyalarınızı yarada bilərsiniz. Buranı tez-tez yoxla Glucosio köməkçisi müntəzəm məsləhətlər verir və yaxşılaşmağa davam edəcək, buna görə hər zaman Glucosio təcrübənizi yaxşılaşdıracaq və digər faydalı şeylər üçün buranı yoxlayın. - Əks əlaqə göndər Əgər siz hər hansı texniki problem aşkar etsəniz və ya Glucosio ilə əks əlaqə yaratmaq istəsəniz, Glucosio-u yaxşılaşdırmağa kömək etmək üçün nizamlamalardan bizə təqdim etməyinizi xahiş edirik. Oxuma əlavə et Qlükozanın öz ifadələrini daim əlavə etdiyinizə əmin olun. Buna görə sizə uzun vaxt ərzində qlükozanın səviyyələrini izləməyə kömək edə bilərik. + Məlumatlarınızı ixrac edin + Məlumatlarınızı həkiminizlə paylaşın və ya ixrac etmə funksiyasından istifadə etmək üçün Google drive-da ehtiyatlayın. + HbA1c hesabla + Glucosio-nın daxili HbA1c kalkulyatoru artıq naviqasiya panelində mövcuddur. Orta qan qlükozanızı daxil edin və hesablanmış HbA1c dəyərini həmən an yadda saxlayın. Seçilən aralıq Şəxsi aralıq Minimum dəyər Maksimum dəyər + Dil + Quraşıldırılmış e-poçt proqramı yoxdur. Zəhmət olmasa, məktubunuzu hello@glucosio.org ünvanına göndərin + Başqa insanlar dəvət et + Diabetlərin idarə edilməsi və araşdırılması üçün olan açıq qaynaqlı Glucosio proqramını sınayın. + Glucosio-nı sınayın + Google Drive Ehtiyatlama + Ehtiyatla və İxrac et + Gizlilik + Glucosio-dan istifadə etməklə aşağıdakılarla razılaşırsınız. + Google Drive + Glucosio haqqında + Glucosio-a qiymət ver + Açıq qaynaq lisenziyaları + FreeStyle LibreⓇ dəstəyini aktiv et + EKSPERİMENTAL: FreeStyle LibreⓇ dəstəyini aktiv et + EKSPERİMENTAL: Oxunabilirliliyi disleksiyalı istifadəçilər üçün yaxşılaşdır + Oxunabilirliliyi disleksiyalı istifadəçilər üçün yaxşılaşdır + Glucosio-a dəstək ol + OLDU + Qanda şəkərin az olması + Az + Yüksək + Qanda şəkərin az olması + Yavaş yürüş + Sürətli yürüş + Qaçış + Qaçış + Üzgüçülük + Rəqs etmə + Rolik sürmə + Velosiped sürmə + Qolf + Beyzbol + Badminton + Futbol + Basketbol + Voleybol + Kriket + Frizbi + Xizək sürmə + Boks + Tenis + Masa tenisi + Döyüş sənətləri + Dağa dırmanma + Güləş + Gəxinti + Baxça işlərii + + + + + + + Karbohidrat: + Protein: + Şəkər: + Yağ: + Yaradıcılar + Dəstək olun + Tərcüməyə dəstək olun + İnkişaf etdirməyə dəstək olun + Diskusiya qrupumuza qoşulun + E-poçt siyaıhımıza abunə olun + ARXİVLƏŞDİRİLMİŞ İPUCLARI + Məlumatı ixrac et + Kimdən: + Kimə: + Bu gün seç + İXRAC ET + Məlumatı ixrac et + Hər şeyi ixrac et + İstifadə edərək paylaş + Glucosio məlumatı + "İxrac edilir" + oxunur + Glucosio ekran şəklini saxlamaq üçün yaddaş icazələrinə ehtiyac duyur + Ekran görüntüsü qalereyada saxlanıldı + Qalereyada saxlamada səhv baş verdi + İxrac etmə sıxlığı + Məlumatların ixracında problem oldu. Lütfən yenidən yoxlayın. + İxrac ediləcək məlumat yoxdu. + Yeni məlumat əlavə edildi Çəki + Ketonlar + Minimum təzyiq + Maksimum təzyiq + Cəmi xalestrol + LDL xolesterol + HDL xolesterol + Hba1C Qlükoza dərəcəsi haqqında məlumat əlavə et + Qlükoza məlumatı əlavə et + Çəki əlavə et + Çəkini redaktə et + Xalestrol səviyyəsi əlavə et + Xalestrol səviyyəsini redaktə et + Hb1AC əlavə et + Hb1AC redaktə et + Ketonlar əlavə et + Ketonlar redaktə et + Qan təzyiqi əlavə et + Qan təzyiqi redaktə et + Çəki + Qan təzyiqi + Xalestrol səviyyəsi + Hba1C Məlumatı + Qan qlükozası səviyyəsi + Hazırda qeyd var. Yeni qeyd əlavə etmək üçün onu silin. + Zəhmət olmasa, telefonunuzu senosun üzərinə qoyun və silkələnənə qədər hərəkət etdirməyin. + Bu cihaz NFC dəstəkləmir. + NFC söndürülüb. + FreeStyle Libre®-dan əlavə et + NFC bağlantısı açılarkən xəta! + FreeStyle Libre®-dan məlumat uğurla əlavə edildi + HbA1c hesablamaq üçün kifayət qədər məlumat yoxdur + HbA1c: + Sizin FreeStyle Libre®-izdən əlavə edin + ORTA QAN QLÜKOZA SƏVİYYƏSİ + HbA1c Kalkulyatoru + YADDA SAXLA + Dəstək + Sizə necə kömək edə bilərik? + E-poçt + Canlı söhbət + Dəstək forumu + Qan qlükoza səviyyənizi qeyd etmə vaxtıdır! + Dərmanlarınızı qeyd etmə vaxtıdır! + Bu sadəcə son ayın məlumatlarının orta dəyərləri ilə hesablanmış təxmini dəyərdir. Bu təxmini dəyərləri istifadə edərkən HbA1c hesablanması üçün təsdiqlənmiş geniş formula istifadə edilir, biz istifadəçilərə bunu sadəcə təxmin olaraq istifadə etməyi məsləhət görürük. + Qeydlər + Ehtiyatla və ixrac et + Google drive-da ehtiyatla + Bərpa et + CSV ixrac + Avtomatik ehtiyatlama + Məlumatların Google drive-da ehtiyatlanması sizə cihazınızı itirərkən və ya dəyişərkən onları yenidən bərpa etmək imkanı verir. + Dəyişikliklərin tətbiqi üçün yenidən başladılır... + Glucosio məlumat bazasını Google Drive ilə sinxronlaşdır. + Glucosio məlumat bazasını cihazınızı itirərkən və ya dəyişərkən bərpa edə və ya iki cihaz arasında sinxronlaşdıra biləcəksiniz. + Məlumat bazası uğurla Google drive-da ehtiyatlandı + Məlumat bazası uğurla Google drive-dan bərpa edildi + Səhv baş verdi. Yenidən yoxlayın :/ + Son ehtiyat: + Ehtiyatlama qovluğu + Nizamlanmayıb + Ehtiyatla + Son ehtiyatlamalar + Daha çox ehtiyat göstər + Əvvəlki versiyanı bərpa et + Ehtiyatın bərpası bütün mövcud məlumatları ehtiyatdakı ilə dəyişəcək. + Ehtiyat detalları + Ləğv et + Ehtiyatı bərpa et + Drive-dan bərpa et + Drive-da bərpa ediləcək etibarlı ehtiyat tapılmadı + Glucosio Google Drive ehtiyatlama üçün Google play xidmətlərinə ehtiyac duyur. + CSV fayla ixrac et + Drive-da idarə et + mmol/mol + Köhnə qrafikə qayıt + tarix + yadda saxla + Xatırlatmalar + Məlumat əlavə et + Xatırlatma əlavə edilməyib. Yeni xatırlatma əlavə et. diff --git a/app/src/main/res/values-ba-rRU/strings.xml b/app/src/main/res/values-ba-rRU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ba-rRU/strings.xml +++ b/app/src/main/res/values-ba-rRU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-bal-rBA/strings.xml b/app/src/main/res/values-bal-rBA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-bal-rBA/strings.xml +++ b/app/src/main/res/values-bal-rBA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ban-rID/strings.xml b/app/src/main/res/values-ban-rID/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ban-rID/strings.xml +++ b/app/src/main/res/values-ban-rID/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-be-rBY/strings.xml b/app/src/main/res/values-be-rBY/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-be-rBY/strings.xml +++ b/app/src/main/res/values-be-rBY/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ber-rDZ/strings.xml b/app/src/main/res/values-ber-rDZ/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ber-rDZ/strings.xml +++ b/app/src/main/res/values-ber-rDZ/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-bfo-rBF/strings.xml b/app/src/main/res/values-bfo-rBF/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-bfo-rBF/strings.xml +++ b/app/src/main/res/values-bfo-rBF/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 46665504..157ba917 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -124,7 +124,6 @@ В Glucosio са предложени готови категории за въвеждане на данни за кръвната захар, но можете да създадете собствени категории в настройките, за да отговарят на вашите уникални нужди. Проверявайте често тук Glucosio помощникът осигурява редовни съвети и ще продължи да се подобрява, така че винаги проверявай тук за полезни действия, които да подобрят вашата употреба на Glucosio и за други полезни съвети. - Изпрати отзив Ако откриете някакви технически грешки или имате отзив за Glucosio ви насърчаваме да го изпратите в менюто \"Настройки\", за да ни помогнете да усъвършенстваме Glucosio. Добави стойност Не забравяйте редовно да добавяте показанията на кръвната ви захар, така ще можем да ви помогнем да проследите нивата с течение на времето. @@ -173,6 +172,12 @@ Бойни изкуства Скално катерене Кеч + + + + + + Въглехидрати: Протеин: diff --git a/app/src/main/res/values-bh-rIN/strings.xml b/app/src/main/res/values-bh-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-bh-rIN/strings.xml +++ b/app/src/main/res/values-bh-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-bi-rVU/strings.xml b/app/src/main/res/values-bi-rVU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-bi-rVU/strings.xml +++ b/app/src/main/res/values-bi-rVU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-bm-rML/strings.xml b/app/src/main/res/values-bm-rML/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-bm-rML/strings.xml +++ b/app/src/main/res/values-bm-rML/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index e589a286..446b5317 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -118,7 +118,6 @@ গ্লুকোসিওতে কিছু ডিফল্ট বিষয়শ্রেণী থাকে আপনার গ্লুকোজ ইনপুট দেওয়ার জন্য তবে আপনি নিজেও আপনার সাথে মিল রেখে সেটিং থেকে নিজস্ব বিষয়শ্রেণী তৈরি করতে পারেন। এখানে প্রায়ই পরীক্ষা করুন গ্লুকোসিও সহযোগী নিয়মিত পরামর্শ প্রদান করে এবং প্রতিনিয়ত নিজেকে আরও ভালো করছে, তাই আপনার গ্লুকোসিও অভিজ্ঞতাকে আরও ভালো করতে এবং অন্যান্য আরও উপকারী পরামর্শ পেতে নিয়মিত এখানে দেখুন এবং কি করতে হবে জানুন। - ফিডব্যাক জমা করুন যেকোন কারিগরি সমস্যায় বা যদি গ্লুকোসিও সম্পর্কে কোন ফিডব্যাক থাকে তাহলে গ্লুকোসিওকে আরও ভালো করতে সেটিং মেনু থেকে তা সাবমিট করুন। পড়ায় যুক্ত করুন অবশ্যই নিয়মিত আপনার গ্লুকোজের মাত্রা যোগ করবেন যেন আমরা আপনাকে আপনার গ্লুকোজের মাত্রা সময়ে সময়ে ট্র্যাক করতে সহযোগীতা করতে পারি। @@ -128,6 +127,12 @@ সর্বোচ্চ মান + + + + + + ওজন diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 473494d8..78512936 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -122,7 +122,6 @@ Glucosio-তে কিছু ডিফল্ট বিষয়শ্রেণী থাকে আপনার গ্লুকোজ ইনপুট দেওয়ার জন্য তবে আপনি নিজেও আপনার সাথে মিল রেখে সেটিংস থেকে নিজস্ব বিষয়শ্রেণী তৈরি করতে পারেন। এখানে প্রায়ই পরীক্ষা করুন Glucosio সহযোগী নিয়মিত পরামর্শ প্রদান করে এবং প্রতিনিয়ত নিজেকে আরও ভালো করছে, তাই আপনার Glucosio অভিজ্ঞতাকে আরও ভালো করতে এবং অন্যান্য আরও উপকারী পরামর্শ পেতে নিয়মিত এখানে দেখুন এবং কি করতে হবে জানুন। - ফিডব্যাক জমা করুন যেকোন কারিগরি সমস্যায় বা যদি Glucosio সম্পর্কে কোন ফিডব্যাক থাকে তাহলে Glucosio-কে আরও ভালো করতে সেটিংস মেনু থেকে তা সাবমিট করুন। পড়া যোগ করুন অবশ্যই নিয়মিত আপনার গ্লুকোজের মাত্রা যোগ করবেন যেন আমরা আপনাকে আপনার গ্লুকোজের মাত্রা সময়ে সময়ে ট্র্যাক করতে সহযোগীতা করতে পারি। @@ -134,6 +133,12 @@ অন্যান্য মানুষদের আমন্ত্রণ করুন + + + + + + ওজন diff --git a/app/src/main/res/values-bo-rBT/strings.xml b/app/src/main/res/values-bo-rBT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-bo-rBT/strings.xml +++ b/app/src/main/res/values-bo-rBT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-br-rFR/strings.xml b/app/src/main/res/values-br-rFR/strings.xml index ff3bd3c9..eada4fa0 100644 --- a/app/src/main/res/values-br-rFR/strings.xml +++ b/app/src/main/res/values-br-rFR/strings.xml @@ -61,6 +61,12 @@ en reizh an yec\'hed + + + + + + diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml index 27d91295..2b5b0a35 100644 --- a/app/src/main/res/values-bs-rBA/strings.xml +++ b/app/src/main/res/values-bs-rBA/strings.xml @@ -122,7 +122,6 @@ Glucosio dolazi sa izvornim kategorijama za unos glukoze ali vi u postavkama možete kreirati zasebne kategorije koje odgovaraju vašim potrebama. Često provjerite ovdje Glucosio asistent pruža redovne savjete i nastavit će se unapređivati, stoga često provjerite ovdje za korisne akcije koje možete poduzeti da poboljšanje svog Glucosio doživljaja te druge korisne savjete. - Pošalji povratne informacije Ukoliko naiđete na tehničke probleme ili imate druge povratne informacije o Glucosiu, molimo vas da ih pošaljete putem menija za postavke kako bismo unaprijedili Glucosio. Dodaj očitavanje Pobrinite se da redovno dodajete svoja očitavanja glukoze kako bismo vam pomogli da pratite vaše nivoe glukoze tokom vremena. @@ -174,6 +173,12 @@ Skijanje Boks Tenis + + + + + + Nivo holesterola diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 6f2823f9..c64e875e 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -136,7 +136,6 @@ El Glucosio ve amb categories predeterminades per entrada de glucosa però podeu crear categories personalitzades dins la configuració per ajustar-ho a les vostres necessitats particulars. Comprova sovint aquí L\'assistent de Glucosio proporciona consells regulars i continuarà millorant, així que comproveu sempre aquí els passos que podeu prendre per millorar l\'experiència de Glucosio i altres consells útils. - Envia comentari Si trobeu incidències tècniques o teniu comentaris sobre Glucosio us animem a enviar-ho des del menú de configuració per tal d\'ajudar-nos a millorar Glucosio. Afegeix una lectura Assegureu-vos d\'afegir regularment les vostres lectures de glucosa per tal que puguem ajudar-vos a fer un seguiment dels vostres nivells de glucosa al llarg del temps. @@ -198,6 +197,12 @@ Lluita lliure Senderisme Feines de jardí + + + + + + Carbohidrats: Proteïnes: @@ -312,7 +317,6 @@ historial desa Recordatoris - Ara és l\'hora de mesurar el nivell de glucosa! Afegeix una lectura No s\'ha trobat cap recordatori, Afegiu un nou. diff --git a/app/src/main/res/values-ce-rCE/strings.xml b/app/src/main/res/values-ce-rCE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ce-rCE/strings.xml +++ b/app/src/main/res/values-ce-rCE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ceb-rPH/strings.xml b/app/src/main/res/values-ceb-rPH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ceb-rPH/strings.xml +++ b/app/src/main/res/values-ceb-rPH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ch-rGU/strings.xml b/app/src/main/res/values-ch-rGU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ch-rGU/strings.xml +++ b/app/src/main/res/values-ch-rGU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-chr-rUS/strings.xml b/app/src/main/res/values-chr-rUS/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-chr-rUS/strings.xml +++ b/app/src/main/res/values-chr-rUS/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ckb-rIR/strings.xml b/app/src/main/res/values-ckb-rIR/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ckb-rIR/strings.xml +++ b/app/src/main/res/values-ckb-rIR/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-co-rFR/strings.xml b/app/src/main/res/values-co-rFR/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-co-rFR/strings.xml +++ b/app/src/main/res/values-co-rFR/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-cr-rNT/strings.xml b/app/src/main/res/values-cr-rNT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-cr-rNT/strings.xml +++ b/app/src/main/res/values-cr-rNT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-crs-rSC/strings.xml b/app/src/main/res/values-crs-rSC/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-crs-rSC/strings.xml +++ b/app/src/main/res/values-crs-rSC/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index ddaad7f4..7e8feaec 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -119,7 +119,6 @@ Vytvořit kategorie Glucosio přichází s výchozími kategoriemi pro zadávání hladin cukru, můžete však vytvořit vlastní kategorie v nastavení tak, aby odpovídaly vašim potřebám. Kontrolujte často - Odeslat zpětnou vazbu Přidat měření Ujistěte se, aby jste pravidelně přidávali hodnoty hladiny glykémie tak, abychom vám mohli pomoci průběžně sledovat hladiny glukózy. Exportujte svá data @@ -168,6 +167,12 @@ Wrestling Turistika Práce na zahradě + + + + + + Sacharidy: Bílkoviny: diff --git a/app/src/main/res/values-csb-rPL/strings.xml b/app/src/main/res/values-csb-rPL/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-csb-rPL/strings.xml +++ b/app/src/main/res/values-csb-rPL/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-cv-rCU/strings.xml b/app/src/main/res/values-cv-rCU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-cv-rCU/strings.xml +++ b/app/src/main/res/values-cv-rCU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-cy-rGB/strings.xml b/app/src/main/res/values-cy-rGB/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-cy-rGB/strings.xml +++ b/app/src/main/res/values-cy-rGB/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 9531e6c6..6429f23e 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -136,7 +136,6 @@ Glucosio kommt mit Standardkategorien für Zuckereingabe, aber sie können benutzerdefinierte Kategorien in Einstellungen entsprechend ihren speziellen Anforderungen erstellen. Kommen sie öfter wieder Glucosio-Assistent bietet regelmäßige Tipps und wird laufend verbessert. Also kommen sie regelmäßig hierhin zurück für sinnvolle Maßnahmen, die sie ergreifen können, um ihr Glucosio-Erlebnis zu verbessern und andere nützliche Tipps. - Feedback geben Wenn sie technische Probleme finden oder Feedback über Glucosio abgeben möchten, empfehlen wir ihnen dies im Menü \"Einstellungen\" einzugeben, um Glucosio zu verbessern. Messwert hinzufügen Achten Sie darauf, regelmäßig Ihre Glukose-Messungen hinzuzufügen, damit wir helfen können, Ihren Blutzuckerspiegel im Laufe der Zeit zu verfolgen. @@ -198,6 +197,12 @@ Wrestling Wandern Gartenarbeit + + + + + + Kohlenhydrate: Eiweiß: @@ -226,6 +231,7 @@ Screenshot in der Galerie gespeichert Fehler beim Speichern des Screenshot in der Galerie Bereichbereich + Es gab ein Problem beim Exportieren der Werte. Bitte versuchen Sie es erneut. Keine Messungen zum exportieren. Neue Messungen hinzugefügt Gewicht @@ -308,4 +314,9 @@ mmol/mol mmol/L Alte Graph-Darstellung verwenden + Verlauf + speichern + Erinnerungen + Messwert hinzufügen + Keine Erinnerungen eingestellt. Füge hier eine neue Erinnerung hinzu. diff --git a/app/src/main/res/values-dsb-rDE/strings.xml b/app/src/main/res/values-dsb-rDE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-dsb-rDE/strings.xml +++ b/app/src/main/res/values-dsb-rDE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-dv-rMV/strings.xml b/app/src/main/res/values-dv-rMV/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-dv-rMV/strings.xml +++ b/app/src/main/res/values-dv-rMV/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-dz-rBT/strings.xml b/app/src/main/res/values-dz-rBT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-dz-rBT/strings.xml +++ b/app/src/main/res/values-dz-rBT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ee-rGH/strings.xml b/app/src/main/res/values-ee-rGH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ee-rGH/strings.xml +++ b/app/src/main/res/values-ee-rGH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-el-rCY/strings.xml b/app/src/main/res/values-el-rCY/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-el-rCY/strings.xml +++ b/app/src/main/res/values-el-rCY/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index dc3dc778..28a62f79 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -136,7 +136,6 @@ Glucosio comes with default categories for glucose input but you can create custom categories in settings to match your unique needs. Check here often Glucosio assistant provides regular tips and will keep improving, so always check here for useful actions you can take to improve your Glucosio experience and for other useful tips. - Submit feedback If you find any technical issues or have feedback about Glucosio we encourage you to submit it in the settings menu in order to help us improve Glucosio. Add a reading Be sure to regularly add your glucose readings so we can help you track your glucose levels over time. @@ -191,6 +190,12 @@ Frisbee Skiing Boxing + + + + + + From: diff --git a/app/src/main/res/values-en-rPT/strings.xml b/app/src/main/res/values-en-rPT/strings.xml index 19454736..c2e9cbe5 100644 --- a/app/src/main/res/values-en-rPT/strings.xml +++ b/app/src/main/res/values-en-rPT/strings.xml @@ -81,7 +81,6 @@ Update ye research opt-in Glucosio comes wit\' default categories fer glucose input but ye can create custom categories in settin\'s to match ye unique needs. Check here often Glucosio assistant provides regular tips \'n gunna keep improvin\', so always check here fer useful actions ye can take to improve ye Glucosio experience \'n fer other useful tips. - Submit feedback If ye find any technical issues or have feedback \'bout Glucosio we encourage ye to submit it in th\' settin\'s menu in order to help us improve Glucosio. Add a reading Be sure to regularly add ye glucose readin\'s so we can help ye track ye glucose levels over the hour. @@ -90,6 +89,12 @@ Update ye research opt-in Share ye data wit\' ye doctor or backup ye data to Google Drive usin\' th\' export weapon. + + + + + + diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml index 879328e0..c04ced28 100644 --- a/app/src/main/res/values-en-rUS/strings.xml +++ b/app/src/main/res/values-en-rUS/strings.xml @@ -124,7 +124,6 @@ Glucosio comes with default categories for glucose input but you can create custom categories in settings to match your unique needs. Check here often Glucosio assistant provides regular tips and will keep improving, so always check here for useful actions you can take to improve your Glucosio experience and for other useful tips. - Submit feedback If you find any technical issues or have feedback about Glucosio we encourage you to submit it in the settings menu in order to help us improve Glucosio. Add a reading Be sure to regularly add your glucose readings so we can help you track your glucose levels over time. @@ -135,6 +134,12 @@ Yard work + + + + + + Carbs: Protein: diff --git a/app/src/main/res/values-eo-rUY/strings.xml b/app/src/main/res/values-eo-rUY/strings.xml index a5c30d1f..e0fbd004 100644 --- a/app/src/main/res/values-eo-rUY/strings.xml +++ b/app/src/main/res/values-eo-rUY/strings.xml @@ -80,7 +80,6 @@ Ĝisdatigi vian pezon Krei kategoriojn Vidi ĉi tie ofte - Sendi rimarkon Aldoni legadon Eksporti viajn datumojn Minimuma valoro @@ -112,6 +111,12 @@ Luktado Marŝado Ĝardenado + + + + + + Karbonhidratoj: Proteino: diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml index 6de15e50..fa1fa5a0 100644 --- a/app/src/main/res/values-es-rCL/strings.xml +++ b/app/src/main/res/values-es-rCL/strings.xml @@ -27,6 +27,7 @@ Reseña Historial Consejos + Añadir nueva lectura Hola. Hola. Condiciones de uso @@ -136,7 +137,6 @@ Glucosio tiene categorías predeterminadas para la entrada de glucosa, pero puedes crear categorías personalizadas en la configuración para que coincida con tus necesidades particulares. Revise esto a menudo Asistente de Glucosio ofrece consejos regulares y seguirá mejorando, así que siempre revisa aquí para ver lo que puedes hacer para mejorar tu experiencia con Glucosio y por otros consejos útiles. - Enviar Comentarios Si encuentra cualquier problema técnico o desea comentar sobre Glucosio, envíenos sus comentarios en el menú de configuración para que mejoremos Glucosio. Añadir Lectura Asegúrese de añadir regularmente sus lecturas de glucosa para que podamos ayudarle a seguir a lo largo del tiempo sus niveles de glucosa. @@ -198,6 +198,12 @@ Lucha libre Senderismo Trabajo de jardinería + + + + + + Carbohidratos: Proteínas: @@ -226,6 +232,7 @@ Se ha guardado tu captura de pantalla en la galería Ocurrió un error al guardar la captura de pantalla en la galería Rango de exportación + Hubo un problema al exportar las lecturas. Inténtelo de nuevo. No hay lecturas para exportar. Nueva lectura añadida Peso @@ -239,10 +246,15 @@ Añadir lectura de glucosa Editar lectura de glucosa Añadir peso corporal + Editar peso corporal Añadir nivel de colesterol + Editar nivel de colesterol Añadir HBA1C + Editar HbA1c Añadir cetonas + Editar cetonas Añadir presión arterial + Editar presión arterial Peso Corporal Cetonas Presión arterial @@ -286,6 +298,7 @@ Algo salió mal. Inténtelo de nuevo :/ Última copia de seguridad: Carpeta de las copias de seguridad + Sin configurar Hacer copia ahora Últimas copias de seguridad Ver más copias de seguridad @@ -302,4 +315,9 @@ mmol/mol mmol/L Volver al gráfico antiguo + historial + guardar + Recordatorios + Añadir lectura + No tiene configurado los recordatorios. Añada un recordatorio aquí. diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml index 11db78d9..f67aed41 100644 --- a/app/src/main/res/values-es-rCO/strings.xml +++ b/app/src/main/res/values-es-rCO/strings.xml @@ -27,6 +27,7 @@ Información general Historial Consejos + Añadir nueva lectura Hola. Hola. Términos de Uso. @@ -136,7 +137,7 @@ Glucosio tiene categorías predeterminadas para la entrada de glucosa, pero puede crear categorías personalizadas en la configuración para que coincida con sus necesidades particulares. Revise esto a menudo Asistente de Glucosio ofrece consejos regulares y seguirá mejorando, así que siempre revisa aquí para ver lo que puede hacer para mejorar su experiencia con Glucosio y por otros consejos útiles. - Enviar Comentarios + Enviar comentarios Si encuentra cualquier problema técnico o tiene comentarios sobre Glucosio, le animamos a enviar sus comentarios en el menú de configuración con el fin de ayudarnos a mejorar Glucosio. Añadir Lectura Asegúrese de añadir regularmente sus lecturas de glucosa para que podamos ayudarle a seguir sus niveles de glucosa a lo largo del tiempo. @@ -198,6 +199,12 @@ Lucha libre Senderismo Trabajo de jardinería + + + + + + Carbohidratos: Proteínas: @@ -226,6 +233,7 @@ Captura de pantalla guardada en la galería Error al guardar la captura de pantalla en la galería Exportar rango + Hubo un problema al exportar las lecturas. Por favor inténtelo de nuevo. No hay lecturas para exportar. Nueva lectura añadida Peso @@ -239,10 +247,15 @@ Añadir lectura de glucosa Editar lectura de glucosa Añadir peso corporal + Editar peso corporal Añadir nivel de colesterol + Editar nivel de colesterol Añadir HB1AC + Editar HBA1C Añadir cetonas + Editar cetonas Añadir presión arterial + Editar presión arterial Peso corporal Cetonas Presión arterial @@ -286,6 +299,7 @@ Algo salió mal. Por favor, inténtelo de nuevo :/ Última copia de seguridad: Carpeta de las copias de seguridad + Sin configurar Hacer copia ahora Respaldos recientes Ver más copias de seguridad @@ -301,4 +315,9 @@ Gestionar en Drive mmol/L Volver al gráfico antiguo + historial + guardar + Recordatorios + Añadir Lectura + No hay recordatorios. agregar un nuevo recordatorio. diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml index ccfdfad7..4b6334f5 100644 --- a/app/src/main/res/values-es-rDO/strings.xml +++ b/app/src/main/res/values-es-rDO/strings.xml @@ -27,6 +27,7 @@ Información general Historial Consejos + Añadir nueva lectura Hola. Hola. Términos de Uso @@ -136,7 +137,7 @@ Glucosio tiene categorías predeterminadas para la entrada de glucosa, pero puede crear categorías personalizadas en la configuración para que coincida con sus necesidades particulares. Revise esto a menudo Asistente de Glucosio ofrece consejos regulares y seguirá mejorando, así que siempre revisa aquí para ver lo que puede hacer para mejorar su experiencia con Glucosio y por otros consejos útiles. - Enviar Comentarios + Enviar comentarios Si encuentra cualquier problema técnico o tiene comentarios sobre Glucosio, le animamos a enviar sus comentarios en el menú de configuración con el fin de ayudarnos a mejorar Glucosio. Agregar Lectura Asegúrese de agregar regularmente sus lecturas de glucosa para que podamos ayudarle a seguir sus niveles de glucosa a lo largo del tiempo. @@ -198,6 +199,12 @@ Lucha libre Senderismo Trabajo de jardinería + + + + + + Carbohidratos: Proteínas: @@ -226,6 +233,7 @@ Captura de pantalla guardada en la galería Error al guardar la captura de pantalla en la galería Exportar rango + Hubo un problema al exportar las lecturas. Por favor inténtelo de nuevo. No hay lecturas para exportar. Nueva lectura añadida Peso @@ -239,10 +247,15 @@ Añadir lectura de glucosa Editar lectura de glucosa Añadir peso corporal + Editar peso corporal Añadir nivel de colesterol + Editar nivel de colesterol Añadir HB1AC + Editar HBA1C Añadir cetonas + Editar cetonas Añadir presión arterial + Editar presión arterial Peso corporal Cetonas Presión arterial @@ -286,6 +299,7 @@ Algo salió mal. Por favor, inténtelo de nuevo :/ Última copia de seguridad: Carpeta de las copias de seguridad + Sin configurar Hacer copia ahora Respaldos recientes Ver más copias de seguridad @@ -301,4 +315,9 @@ Gestionar en Drive mmol/L Volver al gráfico antiguo + historial + guardar + Recordatorios + Añadir Lectura + No hay recordatorios. agregar un nuevo recordatorio. diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 11dcac55..9d5f73fa 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -27,6 +27,7 @@ Información general Historial Consejos + Añadir nueva lectura Hola. Hola. Términos de Uso. @@ -136,7 +137,6 @@ Glucosio tiene categorías predeterminadas para la entrada de glucosa, pero puede crear categorías personalizadas en la configuración para que coincida con sus necesidades particulares. Revise esto a menudo Asistente de Glucosio ofrece consejos regulares y seguirá mejorando, así que siempre revisa aquí para ver lo que puede hacer para mejorar su experiencia con Glucosio y por otros consejos útiles. - Enviar Comentarios Si encuentra cualquier problema técnico o tiene comentarios sobre Glucosio, le animamos a enviar sus comentarios en el menú de configuración con el fin de ayudarnos a mejorar Glucosio. Añadir Lectura Asegúrese de añadir regularmente sus lecturas de glucosa para que podamos ayudarle a seguir sus niveles de glucosa a lo largo del tiempo. @@ -198,6 +198,12 @@ Lucha libre Senderismo Trabajo de jardinería + + + + + + Carbohidratos: Proteínas: @@ -226,6 +232,7 @@ Captura de pantalla guardada en la galería Error al guardar la captura de pantalla en la galería Exportar rango + Hubo un problema al exportar las lecturas. Por favor inténtelo de nuevo. No hay lecturas para exportar. Nueva lectura añadida Peso @@ -239,10 +246,15 @@ Añadir lectura de glucosa Editar lectura de glucosa Añadir peso corporal + Editar peso corporal Añadir nivel de colesterol + Editar nivel de colesterol Añadir HB1AC + Editar HBA1C Añadir cetonas + Editar cetonas Añadir presión arterial + Editar presión arterial Peso corporal Cetonas Presión arterial @@ -286,6 +298,7 @@ Algo salió mal. Por favor, inténtelo de nuevo :/ Última copia de seguridad: Carpeta de las copias de seguridad + Sin configurar Hacer copia ahora Respaldos recientes Ver más copias de seguridad @@ -302,4 +315,9 @@ mmol/mol mmol/L Volver al gráfico antiguo + historial + guardar + Recordatorios + Añadir Lectura + No hay recordatorios. agregar un nuevo recordatorio. diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index 0ecc1d4b..87ac5473 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -27,6 +27,7 @@ Resumen Historial Consejos + Agregar lectura nueva Hola. Hola. Términos de Uso. @@ -136,7 +137,6 @@ Glucosio tiene categorías predeterminadas para la entrada de glucosa, pero puede crear categorías personalizadas en la configuración para que coincida con sus necesidades particulares. Revise esto a menudo Asistente de Glucosio ofrece consejos regulares y seguirá mejorando, así que siempre revisa aquí para ver lo que puede hacer para mejorar su experiencia con Glucosio y para aprender otros consejos útiles. - Enviar comentarios Si encuentra cualquier problema técnico o tiene comentarios sobre Glucosio, le animamos a enviar sus comentarios en el menú de configuración con el fin de ayudarnos a mejorar Glucosio. Añadir una medición de glucosa Asegúrese de añadir regularmente sus lecturas de glucosa para que podamos ayudarle a seguir sus niveles de glucosa a largo plazo. @@ -198,6 +198,12 @@ Lucha libre Senderismo Trabajo de jardinería + + + + + + Carbohidratos: Proteínas: @@ -226,6 +232,7 @@ Captura de pantalla guardada en la galería Error al guardar la captura de pantalla en la galería Exportar rango + Ocurrió un error al exportar las lecturas. Intentalo de nuevo. No hay lecturas para exportar. Nueva lectura añadida Peso @@ -239,10 +246,15 @@ Añadir lectura de glucosa Editar lectura de glucosa Añadir peso corporal + Editar peso corporal Añadir nivel de colesterol + Editar nivel de colesterol Añadir HBA1C + Editar HBA1C Añadir cetonas + Editar cetonas Añadir presión arterial + Editar presión arterial Peso corporal Cetonas Presión arterial @@ -286,6 +298,7 @@ Algo salió mal. Inténtalo de nuevo :/ Última copia de seguridad: Carpeta de las copias de seguridad + Sin configurar Respaldar ahora Copias de seguridad recientes Ver más copias de seguridad @@ -302,4 +315,9 @@ mmol/mol mmol/L Volver al gráfico antiguo + historial + guardar + Recordatorios + Añadir Lectura + No hay recordatorios. agregar un nuevo recordatorio. diff --git a/app/src/main/res/values-es-rVE/strings.xml b/app/src/main/res/values-es-rVE/strings.xml index af97712a..eeef84e5 100644 --- a/app/src/main/res/values-es-rVE/strings.xml +++ b/app/src/main/res/values-es-rVE/strings.xml @@ -27,6 +27,7 @@ Resumen Historial Consejos + Añadir nueva lectura Hola. Hola. Términos de uso @@ -136,7 +137,6 @@ Glucosio tiene categorías predeterminadas para la entrada de glucosa, pero puede crear categorías personalizadas en la configuración para que coincida con sus necesidades particulares. Revise esto a menudo Asistente de Glucosio ofrece consejos regulares y seguirá mejorando, así que siempre revisa aquí para ver lo que puede hacer para mejorar su experiencia con Glucosio y por otros consejos útiles. - Enviar comentarios Si encuentra cualquier problema técnico o tiene comentarios sobre Glucosio, le animamos a enviar sus comentarios en el menú de configuración con el fin de ayudarnos a mejorar Glucosio. Añadir una medición de glucosa Asegúrese de añadir regularmente sus lecturas de glucosa para que podamos ayudarle a seguir sus niveles de glucosa a lo largo del tiempo. @@ -198,6 +198,12 @@ Lucha libre Senderismo Trabajo de jardinería + + + + + + Carbohidratos: Proteína: @@ -226,6 +232,7 @@ Captura de pantalla guardada en la galería Error al guardar la captura de pantalla en la galería Exportar rango + Hubo un problema al exportar las lecturas. Por favor inténtelo de nuevo. No hay lecturas para exportar. Nueva lectura añadida Peso @@ -239,10 +246,15 @@ Añadir lectura de glucosa Editar lectura de glucosa Añadir peso corporal + Editar peso corporal Añadir nivel de colesterol + Editar nivel de colesterol Añadir HBA1C + Editar HBA1C Añadir cetonas + Editar cetonas Añadir presión arterial + Editar presión arterial Peso corporal Cetonas Presión arterial @@ -286,6 +298,7 @@ Algo salió mal. Por favor, inténtelo de nuevo :/ Última copia de seguridad: Carpeta de las copias de seguridad + Sin configurar Hacer copia de seguridad ahora Respaldos recientes Ver más copias de seguridad @@ -302,4 +315,9 @@ mmol/mol mmol/L Volver al gráfico antiguo + historial + guardar + Recordatorios + Añadir Lectura + No hay recordatorios. agregar un nuevo recordatorio. diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-et-rEE/strings.xml +++ b/app/src/main/res/values-et-rEE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-eu-rES/strings.xml +++ b/app/src/main/res/values-eu-rES/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-fa-rAF/strings.xml b/app/src/main/res/values-fa-rAF/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-fa-rAF/strings.xml +++ b/app/src/main/res/values-fa-rAF/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml index d1ef05a9..744a07e4 100644 --- a/app/src/main/res/values-fa-rIR/strings.xml +++ b/app/src/main/res/values-fa-rIR/strings.xml @@ -113,7 +113,6 @@ وزن خود را به روز رسانی کنید ایجاد دسته اینجا را مکررا بررسی کنید - ارسال انتقادات و پیشنهادات اضافه کردن اندازه گیری محدوده مورد نظر محدوده سفارشی @@ -161,6 +160,12 @@ کشتی پیاده روی کار در حیاط + + + + + + کربوهیدرات: پروتئین: diff --git a/app/src/main/res/values-ff-rZA/strings.xml b/app/src/main/res/values-ff-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ff-rZA/strings.xml +++ b/app/src/main/res/values-ff-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 79f73822..2942101f 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -73,6 +73,12 @@ Lisää lukema + + + + + + diff --git a/app/src/main/res/values-fil-rPH/strings.xml b/app/src/main/res/values-fil-rPH/strings.xml index 5941feb0..675d5c56 100644 --- a/app/src/main/res/values-fil-rPH/strings.xml +++ b/app/src/main/res/values-fil-rPH/strings.xml @@ -116,7 +116,6 @@ Ang Glucosio ay mga kategoryang kalakip para sa glucose input, ngunit maaari kang gumawa ng sarili mong kategorya kung nanaisin. Pumunta dito ng madalas Nagbibigay ang Glucosio assistant ng mga payo kung paano gaganda ang iyong kalusugan at kung paano mo makukuha ang benepisyo ng paggamit ng Glucosio. - I-submit ang feedback Kung may mga katanungang pangteknikal or may mga puna at suhesyon para sa Glucosio, pumunta sa settings menu. Magdagdag ng reading Siguraduhing palaging magdagdag ng iyong glucose readings para ikaw matulungan naming i-track ang iyong glucose levels. @@ -126,6 +125,12 @@ Max value + + + + + + diff --git a/app/src/main/res/values-fj-rFJ/strings.xml b/app/src/main/res/values-fj-rFJ/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-fj-rFJ/strings.xml +++ b/app/src/main/res/values-fj-rFJ/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-fo-rFO/strings.xml b/app/src/main/res/values-fo-rFO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-fo-rFO/strings.xml +++ b/app/src/main/res/values-fo-rFO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 20d38e9d..f3ebafa9 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -137,7 +137,6 @@ Glucosio comprend des catégories par défaut pour l\'entrée de glucose mais vous pouvez créer des catégories personnalisées dans paramètres pour assortir vos besoins uniques. Vérifiez souvent Glucosio assistant fournit des conseils réguliers et va continuer à améliorer, il faut donc toujours vérifier ici pour des actions utiles, que vous pouvez prendre pour améliorer votre expérience de Glucosio et pour d\'autres conseils utiles. - Envoyer un commentaire Si vous trouvez des problèmes techniques ou avez des commentaires sur Glucosio nous vous encourageons à nous les transmettre dans le menu réglages afin de nous aider à améliorer Glucosio. Ajouter une lecture N\'oubliez pas d\'ajouter régulièrement vos lectures de glucose, donc nous pouvons vous aider à suivre votre taux de glucose dans le temps. @@ -199,6 +198,12 @@ Lutte Randonnée Jardinage + + + + + + Glucides : Protéines : @@ -227,6 +232,7 @@ Copie d\'écran enregistrée dans la galerie photo Erreur à l\'enregistrement de la copie d\'écran dans la galerie photo Fourchette d\'exportation + Il y a eu un problème à l\'exportation des lectures. Veuillez réessayer. Aucun enregistrement à exporter. Nouvel enregistrement ajouté Poids @@ -312,6 +318,6 @@ historique enregistrer Rappels - Il est temps de mesurer votre glycémie ! + Ajouter une lecture Aucun rappel de la valeur. Ajouter un nouveau rappel ici. diff --git a/app/src/main/res/values-fr-rQC/strings.xml b/app/src/main/res/values-fr-rQC/strings.xml index 4c2e01e2..88ddaa9f 100644 --- a/app/src/main/res/values-fr-rQC/strings.xml +++ b/app/src/main/res/values-fr-rQC/strings.xml @@ -137,7 +137,7 @@ Glucosio comprend des catégories par défaut pour l\'entrée de glucose mais vous pouvez créer des catégories personnalisées dans paramètres pour assortir vos besoins uniques. Vérifiez souvent Glucosio assistant fournit des conseils réguliers et va continuer à améliorer, il faut donc toujours vérifier ici pour des actions utiles, que vous pouvez prendre pour améliorer votre expérience de Glucosio et pour d\'autres conseils utiles. - Envoyer un commentaire + Envoyer un commentaire Si vous trouvez des problèmes techniques ou avez des commentaires sur Glucosio nous vous encourageons à nous les transmettre dans le menu réglages afin de nous aider à améliorer Glucosio. Ajouter une lecture N\'oubliez pas d\'ajouter régulièrement vos lectures de glucose, donc nous pouvons vous aider à suivre votre taux de glucose dans le temps. @@ -199,6 +199,12 @@ Lutte Randonnée Jardinage + + + + + + Glucides : Protéines : @@ -227,6 +233,7 @@ Copie d\'écran enregistrée dans la galerie photo Erreur à l\'enregistrement de la copie d\'écran dans la galerie photo Fourchette d\'exportation + Il y a eu un problème à l\'exportation des lectures. Veuillez réessayer. Aucun enregistrement à exporter. Nouvel enregistrement ajouté Poids @@ -311,6 +318,6 @@ historique enregistrer Rappels - Il est temps de mesurer votre glycémie ! + Ajouter une lecture Aucun rappel de la valeur. Ajouter un nouveau rappel ici. diff --git a/app/src/main/res/values-fra-rDE/strings.xml b/app/src/main/res/values-fra-rDE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-fra-rDE/strings.xml +++ b/app/src/main/res/values-fra-rDE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-frp-rIT/strings.xml b/app/src/main/res/values-frp-rIT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-frp-rIT/strings.xml +++ b/app/src/main/res/values-frp-rIT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-fur-rIT/strings.xml b/app/src/main/res/values-fur-rIT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-fur-rIT/strings.xml +++ b/app/src/main/res/values-fur-rIT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml index 35b0fa5a..c2a04093 100644 --- a/app/src/main/res/values-fy-rNL/strings.xml +++ b/app/src/main/res/values-fy-rNL/strings.xml @@ -70,10 +70,15 @@ ÚTLÊZING TAFOEGJE Kategoryen meitsje Sjoch hjir regelmjittich - Weromkeppeling ferstjoere In útlêzing tafoegje + + + + + + diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml index d5257239..482d7ab7 100644 --- a/app/src/main/res/values-ga-rIE/strings.xml +++ b/app/src/main/res/values-ga-rIE/strings.xml @@ -136,7 +136,6 @@ Tagann Glucosio le catagóirí réamhshocraithe le haghaidh ionchurtha glúcóis, ach is féidir leat catagóirí de do chuid féin a chruthú sna socruithe. Féach anseo go minic Tugann Cúntóir Glucosio leideanna duit go rialta, agus rachaidh sé i bhfeabhas de réir a chéile. Mar sin, ba chóir duit filleadh anseo anois is arís le gníomhartha agus leideanna úsáideacha a fháil. - Seol aiseolas Má fheiceann tú aon fhadhb theicniúil, nó más mian leat aiseolas faoi Glucosio a thabhairt dúinn, is féidir é sin a dhéanamh sa roghchlár Socruithe, chun cabhrú linn Glucosio a fheabhsú. Tomhas nua Ba chóir duit do leibhéal glúcos fola a thástáil go rialta sa chaoi go mbeidh tú in ann an leibhéal a leanúint thar thréimhse ama. @@ -198,6 +197,12 @@ Iomrascáil Cnocadóireacht Garraíodóireacht + + + + + + Carbaihiodráití: Próitéin: diff --git a/app/src/main/res/values-gaa-rGH/strings.xml b/app/src/main/res/values-gaa-rGH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-gaa-rGH/strings.xml +++ b/app/src/main/res/values-gaa-rGH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-gd-rGB/strings.xml b/app/src/main/res/values-gd-rGB/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-gd-rGB/strings.xml +++ b/app/src/main/res/values-gd-rGB/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml index 16137e33..4cf97c76 100644 --- a/app/src/main/res/values-gl-rES/strings.xml +++ b/app/src/main/res/values-gl-rES/strings.xml @@ -136,7 +136,6 @@ Glucosio ten xa unhas categorías predefinidas para a entrada de rexistros, mais sempre podes crear outras personalizadas que se adapten ás túas necesidades. Comprobar a miúdo O asistente de Glucosio ofrece consellos periodicamente e seguirá mellorando, polo que ten ansia de revisar esta sección para mellorar a túa experiencia coa aplicación e recibir consellos útiles. - Enviar comentarios Se dás con calquera problema técnico ou tes comentarios sobre Glucosio, animámoste a envialos desde o menú dos axustes co fin de contribuír á mellora e evolución de Glucosio. Engadir un rexistro Procura ir engadindo periodicamente os teus rexistros ou lecturas de glicosa para que así poidamos axudarche a levar conta deles no tempo. @@ -198,6 +197,12 @@ Loita Excursionismo Xardinaría + + + + + + Carbohidratos: Proteínas: @@ -312,7 +317,6 @@ historial gardar Recordatorios - É hora de rexistrar o nivel de glucosa! Engadir unha lectura Recordatorios non definidos. Engadir aquí un novo. diff --git a/app/src/main/res/values-gn-rPY/strings.xml b/app/src/main/res/values-gn-rPY/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-gn-rPY/strings.xml +++ b/app/src/main/res/values-gn-rPY/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml index c76dc2da..4ad93fc7 100644 --- a/app/src/main/res/values-gu-rIN/strings.xml +++ b/app/src/main/res/values-gu-rIN/strings.xml @@ -47,9 +47,14 @@ છેલ્લી ચકાસણી: ગયા મહિના નું સરવૈયું: હમમ, સમજાઈ ગયું - પ્રતિક્રિયા મોકલો + + + + + + diff --git a/app/src/main/res/values-gv-rIM/strings.xml b/app/src/main/res/values-gv-rIM/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-gv-rIM/strings.xml +++ b/app/src/main/res/values-gv-rIM/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ha-rHG/strings.xml b/app/src/main/res/values-ha-rHG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ha-rHG/strings.xml +++ b/app/src/main/res/values-ha-rHG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-haw-rUS/strings.xml b/app/src/main/res/values-haw-rUS/strings.xml index 012bcd26..31867d0a 100644 --- a/app/src/main/res/values-haw-rUS/strings.xml +++ b/app/src/main/res/values-haw-rUS/strings.xml @@ -60,12 +60,17 @@ Ke ʻAno Haku i nā māhele E hoʻi pinepine - Hoʻouna i ka manaʻo Inā loaʻa i ka pilikia ʻoe a i ʻole loaʻa iā ʻoe ka manaʻo no Glucosio, hoʻopaipai mākou i ka waiho ʻana o ia mea āu i ka papa kauna i hiki mākou ke holomua iā Glucosio. Hoʻohui i ka heluhelu E hoʻohui pinepine i kou mau heluhelu monakō i hiki mākou ke kōkua i ka nānā ʻana o kou ana monakō ma o ka manawa holomua. + + + + + + diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 3dd49f6a..196b7204 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -112,7 +112,6 @@ अपने अनुसंधान में ऑप्ट अद्यतन श्रेणियों बनाएँ यहाँ अक्सर चेक - प्रतिक्रिया सबमिट करें एक पढ़ने जोड़ें पसंदीदा श्रेणी कस्टम श्रेणी @@ -120,6 +119,12 @@ अधिकतम मूल्य + + + + + + diff --git a/app/src/main/res/values-hil-rPH/strings.xml b/app/src/main/res/values-hil-rPH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-hil-rPH/strings.xml +++ b/app/src/main/res/values-hil-rPH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-hmn-rCN/strings.xml b/app/src/main/res/values-hmn-rCN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-hmn-rCN/strings.xml +++ b/app/src/main/res/values-hmn-rCN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ho-rPG/strings.xml b/app/src/main/res/values-ho-rPG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ho-rPG/strings.xml +++ b/app/src/main/res/values-ho-rPG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml index 20b38b4c..a3b4fcf4 100644 --- a/app/src/main/res/values-hr-rHR/strings.xml +++ b/app/src/main/res/values-hr-rHR/strings.xml @@ -131,7 +131,6 @@ Glucosio dolazi sa zadanim kategorijama za unos glukoze ali vi u postavkama možete stvoriti prilagođene kategorije koje odgovaraju vašim potrebama. Često provjerite ovdje Glucosio asistent pruža redovite savjete i nastavit će se poboljšavati, stoga često provjerite ovdje za korisne akcije koje možete poduzeti da poboljšanje svog Glucosio doživljaja te druge korisne savjete. - Pošalji povratnu informaciju Ako naiđete na tehničke pogreške ili imate druge povratne informacije o Glucosiu, molimo vas da ih pošaljete putem menija kako bismo unaprijedili Glucosio. Dodaj očitavanje Pobrinite se da redovno dodajete svoja očitavanja glukoze kako bismo vam pomogli da pratite vašu razinu glukoze tijekom vremena. @@ -190,6 +189,12 @@ Hrvanje Planinarenje Radovi u vrtu + + + + + + Ugljikohidrati: Proteini: diff --git a/app/src/main/res/values-hsb-rDE/strings.xml b/app/src/main/res/values-hsb-rDE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-hsb-rDE/strings.xml +++ b/app/src/main/res/values-hsb-rDE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ht-rHT/strings.xml b/app/src/main/res/values-ht-rHT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ht-rHT/strings.xml +++ b/app/src/main/res/values-ht-rHT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-hy-rAM/strings.xml +++ b/app/src/main/res/values-hy-rAM/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-hz-rNA/strings.xml b/app/src/main/res/values-hz-rNA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-hz-rNA/strings.xml +++ b/app/src/main/res/values-hz-rNA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ig-rNG/strings.xml b/app/src/main/res/values-ig-rNG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ig-rNG/strings.xml +++ b/app/src/main/res/values-ig-rNG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ii-rCN/strings.xml b/app/src/main/res/values-ii-rCN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ii-rCN/strings.xml +++ b/app/src/main/res/values-ii-rCN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ilo-rPH/strings.xml b/app/src/main/res/values-ilo-rPH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ilo-rPH/strings.xml +++ b/app/src/main/res/values-ilo-rPH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index d132e088..5691b9ca 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -22,9 +22,11 @@ Pengaturan Kirim umpan balik + Undang teman Ikhtisar Riwayat Kiat + Tambahkan bacaan baru Halo. Halo. Ketentuan Penggunaan. @@ -55,6 +57,7 @@ Setelah makan siang Sebelum makan malam Setelah makan malam + Kudapan Malam Periksa kembali Lainnya @@ -73,6 +76,7 @@ Minggu Tentang Versi + Segera... Syarat penggunaan Tipe Berat @@ -106,6 +110,7 @@ Asisten PERBARUI SEKARANG JUGA OK, MENGERTI + KIRIM SARAN TAMBAHKAN BACAAN COBA SEKARANG JUGA Perbarui berat kamu @@ -116,16 +121,98 @@ Glucosio dilengkapi kategori baku untuk masukan glukosa namun kamu juga bisa membuat kategori lain di pengaturan untuk menyesuaikan kebutuhan unikmu. Sering-seringlah memeriksa Asisten Glucosio memberikan kiat berkala dan akan terus berkembang, jadi pastikan untuk selalu periksa disini untuk aksi bermanfaat yang bisa kamu lakukan demi meningkatkan pengalaman Glucosio dan kiat bermanfaat lainnya. - Kirim umpan balik Jika kamu menemukan masalah teknik atau umpan balik tentang Glucosio kami mengharapkan kamu untuk mengirimkannya pada menu pengaturan demi membantu kami meningkatkan Glucosio. Tambahkan bacaan Pastikan untuk menambahkan bacaan glukosamu secara berkala agar kami dapat membantu melacak level glukosamu. + Ekspor data Anda Kisaran yang diinginkan Nilai minimal Nilai maksimal + Bahasa + Tidak ada aplikasi email yang terpasang. Silakan kirim email ke hello@glucosio.org + Undang orang lain + Coba Glucosio, sebuah aplikasi sumber terbuka untuk manajemen diabetes dan penelitian. + Coba Glucosio + Privasi + Dengan menggunakan Glucosio, Anda setuju dengan + Tentang Glucosio + Lisensi sumber terbuka + Aktifkan dukungan FreeStyle Libre® + Rendah + Tinggi + Jalan cepat + Berlari + Renang + Menari + Bersepeda + Golf + Tinju + Tenis + Tenis meja + Panjat tebing + Gulat + Mendaki + + + + + + + Karbohidrat: + Protein: + Gula: + Lemak: + Berkontribusi + Dari: + EKSPOR + Ekspor Data + Berbagi menggunakan + Data Glucosio + "Mengekspor" + Tangkapan layar disimpan di Galeri + Ada masalah saat mengekspor bacaan. Silakan coba lagi. + Tidak ada bacaan untuk diekspor. Berat + Keton + Tekanan minimal + Tekanan maksimal + HbA1c + Tambahkan bacaan Glukosa + Ubah bacaan Glukosa + Tambahkan Berat Badan + Ubah Berat Badan + Tambahkan Tingkat Kolesterol + Ubah Tingkat Kolesterol + Tambahkan HbA1c + Ubah HbA1c + Tambahkan Keton + Ubah Keton + Tambahkan Tekanan Darah + Ubah Tekanan Darah + Berat Badan + Tekanan Darah + Tingkat Kolesterol + Tingkat Gula Darah + Anda sudah memiliki entri untuk saat ini. Silakan menghapusnya sebelum menambahkan koreksi. + Silakan meletakan ponsel Anda pada sensor dan jangan bergerak sampai itu bergetar. + Perangkat ini tidak mendukung NFC. + NFC dinonaktifkan. + Tambahkan dari FreeStyle Libre® + Berhasil menambahkan bacaan dari FreeStyle Libre® + HbA1c: + Ditambahkan dari FreeStyle Libre® Anda + RATA-RATA KADAR GULA DARAH + SIMPAN + Dukungan + Email + Cadangkan sekarang + Batal + riwayat + simpan + Pengingat + Tambahkan bacaan diff --git a/app/src/main/res/values-is-rIS/strings.xml b/app/src/main/res/values-is-rIS/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-is-rIS/strings.xml +++ b/app/src/main/res/values-is-rIS/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 5057973a..e785ba1f 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -137,7 +137,6 @@ Glucosio ha delle categorie di default per l\'immissione dei valori di glucosio, ma puoi creare categorie personalizzate nelle impostazioni per soddisfare le tue necessità. Controllare spesso qui L\'assistente di Glucosio fornisce constanti suggerimenti e continuerà a migliorare, perciò controlla sempre qui azioni che possono migliorare la tua esperienza d\'uso di Glucosio e altri utili consigli. - Invia feedback Se trovi eventuali problemi tecnici o hai feedback su Glucosio ti invitiamo a segnalarli nel menu impostazioni, al fine di aiutarci a migliorare Glucosio. Aggiungi una lettura Assicurati di aggiungere regolarmente le letture della tua glicemia, così possiamo aiutarti a monitorare i livelli di glucosio nel corso del tempo. @@ -199,6 +198,12 @@ Wrestling Escursionismo Lavori di casa + + + + + + Carboidrati: Proteine: @@ -313,7 +318,6 @@ cronologia salva Promemoria - È ora di aggiungere la tua glicemia! Aggiungi lettura Nessun promemoria impostato. Aggiungine uno qui. diff --git a/app/src/main/res/values-iu-rNU/strings.xml b/app/src/main/res/values-iu-rNU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-iu-rNU/strings.xml +++ b/app/src/main/res/values-iu-rNU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index 8a696a0c..b186958a 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -131,7 +131,6 @@ Glucosio מגיע עם קטגוריות ברירת המחדל עבור קלט רמת הגלוקוז, אך באפשרותך ליצור קטגוריות מותאמות אישית הגדרות כדי להתאים לצרכים הייחודיים שלך. בדוק כאן לעיתים קרובות העוזר ב-Glucosio מספק עצות קבועות לשמור על שיפור, בידקו בתכיפות לגבי שימושי פעולות שבאפשרותך לבצע כדי לשפר את החוויה Glucosio שלך, טיפים שימושיים נוספים. - שלח משוב אם אתם מוצאים כל בעיות טכניות או לקבל משוב אודות Glucosio אנו מעודדים אותך להגיש את זה בתפריט \' הגדרות \' כדי לסייע לנו לשפר את Glucosio. הוסף מדידה הקפד להוסיף באופן קבוע את מדידות רמת הסוכר בדם שלך כדי שנוכל לעזור לך לעקוב אחר רמות הסוכר שלך לאורך זמן. @@ -186,6 +185,12 @@ היאבקות טיולי הליכה טיולים בחצר + + + + + + פחמימות: חלבון: diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index cfdae498..dec3d6b9 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -136,7 +136,6 @@ Glucosio は血糖値入力のデフォルトの分類が付属していますが、設定で、お客様固有のニーズに合わせてカスタム分類を作成することができます。 多くの場合はこちら Glucosio の体験を改善するために行うことができる便利なアクションや、その他の有用なヒントを常にここで確認するため、Glucosio アシスタントは、正規のヒントを提供して改善を維持します。 - フィードバックを送信 技術的な問題を見つけたり、Glucosio についてのフィードバックをしたい場合、 Glucosio を改善するため、設定メニューでそれを送信することをお勧めします。 測定値を追加 私たちが時間をかけてあなたの血糖値を追跡できるように、血糖値の測定値を定期的に追加するようにしてください。 @@ -198,6 +197,12 @@ レスリング ハイキング 庭仕事 + + + + + + 炭水化物: タンパク質: @@ -312,7 +317,6 @@ 履歴 保存 アラーム - 血糖値を記録する時間です! 測定値を追加 アラームは設定されていません。ここで新しいアラームを追加します。 diff --git a/app/src/main/res/values-jbo-rEN/strings.xml b/app/src/main/res/values-jbo-rEN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-jbo-rEN/strings.xml +++ b/app/src/main/res/values-jbo-rEN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ji-rDE/strings.xml b/app/src/main/res/values-ji-rDE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ji-rDE/strings.xml +++ b/app/src/main/res/values-ji-rDE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-jv-rID/strings.xml b/app/src/main/res/values-jv-rID/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-jv-rID/strings.xml +++ b/app/src/main/res/values-jv-rID/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml index 127a87ef..bc4bb0da 100644 --- a/app/src/main/res/values-ka-rGE/strings.xml +++ b/app/src/main/res/values-ka-rGE/strings.xml @@ -101,7 +101,6 @@ Take your medicine as prescribed by your doctor even small lapses in your medicine can impact your blood glucose level and cause other side effects. If having difficulty remembering ask your doctor about medication management and reminder options. კაი, გავიგე - უკუკავშირის გაგზავნა მონაცემთა ექსპორტირება ენა კონფედენციალურობა @@ -121,6 +120,12 @@ ფრენბურთი კრიკეტი ტენისი + + + + + + ცხიმი: diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kdh/strings.xml b/app/src/main/res/values-kdh/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kdh/strings.xml +++ b/app/src/main/res/values-kdh/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kg-rCG/strings.xml b/app/src/main/res/values-kg-rCG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kg-rCG/strings.xml +++ b/app/src/main/res/values-kg-rCG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kj-rAO/strings.xml b/app/src/main/res/values-kj-rAO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kj-rAO/strings.xml +++ b/app/src/main/res/values-kj-rAO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kk-rKZ/strings.xml b/app/src/main/res/values-kk-rKZ/strings.xml index 7b65f874..2e808709 100644 --- a/app/src/main/res/values-kk-rKZ/strings.xml +++ b/app/src/main/res/values-kk-rKZ/strings.xml @@ -84,6 +84,12 @@ өрмелеу Күрес Аулада жұмыс істеу + + + + + + Қанты: Майлылығы: diff --git a/app/src/main/res/values-kl-rGL/strings.xml b/app/src/main/res/values-kl-rGL/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kl-rGL/strings.xml +++ b/app/src/main/res/values-kl-rGL/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-km-rKH/strings.xml b/app/src/main/res/values-km-rKH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-km-rKH/strings.xml +++ b/app/src/main/res/values-km-rKH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kmr-rTR/strings.xml b/app/src/main/res/values-kmr-rTR/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kmr-rTR/strings.xml +++ b/app/src/main/res/values-kmr-rTR/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml index 3921aecb..af4eca6c 100644 --- a/app/src/main/res/values-kn-rIN/strings.xml +++ b/app/src/main/res/values-kn-rIN/strings.xml @@ -63,6 +63,12 @@ ರದ್ದು ಮಾಡು + + + + + + ಗ್ಲುಕೋಸ್ ರೀಡಿಂಗ್ ನಮೂದಿಸಿ diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 0085f60a..9ee068e0 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -26,6 +26,7 @@ 미리보기 기록 Tips + 새로운 수치 추가 안녕하세요 안녕하세요 이용 약관 @@ -94,32 +95,37 @@ 체중 측정 카테고리 선택 - Eat more fresh, unprocessed foods to help reduce carbohydrate and sugar intake. - Read the nutritional label on packaged foods and beverages to control sugar and carbohydrate intake. - When eating out, ask for fish or meat broiled with no extra butter or oil. - When eating out, ask if they have low sodium dishes. - When eating out, eat the same portion sizes you would at home and take the leftovers to go. - When eating out ask for low-calorie items, such as salad dressings, even if they\'re not on the menu. - When eating out ask for substitutions. Instead of French fries, request a double order of a vegetable like salad, green beans or broccoli. - When eating out, order foods that are not breaded or fried. - When eating out ask for sauces, gravy and salad dressings "on the side." - Sugar free doesn’t really mean sugar free. It means 0.5 grams (g) of sugar per serving, so be careful to not indulge in too many sugar free items. - Moving toward a healthy weight helps control blood sugars. Your doctor, a dietitian, and a fitness trainer can get you started on a plan that will work for you. - Checking your blood level and tracking it in an app like Glucosio twice a day will help you be aware of outcomes from food and lifestyle choices. - Get HbA1c blood tests to find out your average blood sugar for the past 2 to 3 months. Your doctor should tell you how frequently this test will be needed to be performed. + 더 신선하고, 가공되지 않은 음식을 먹는 것은 탄수화물과 당 섭취를 줄이는데 도움을 줍니다. + 당과 탕수화물 섭취를 조절하기 위해 포장된 식품과 음료에 있는 영양성분표를 읽으세요. + 외식할 때, 생선이나 고기를 추가적인 버터나 기름없이 구워달라고 요청하세요. + 외식할 때, 저염식 요리가 있는지 물어보세요. + 외식을 할 때는 집에서 먹는 양만큼만 먹고 남은 것은 싸가시기 바랍니다. + 외식할 때, 메뉴에 없더라도 샐러드 드레싱과 같은 저칼로리 품목을 요청하세요. + 외식을 할 때는 다른 것으로 교체하세요. 감자튀김 대신에 샐러드, 콩 또는 브로콜리 같은 채소를 요청하십시오. + 외식할 때, 빵가루를 입히지 않거나 기름에 튀기지 않은 음식을 주문하세요. + 외식을 할 때는 육즙으로 만든 소스를 요청하시고 샐러드 드레싱은 따로 달라고 요청하십시오. + 무설탕은 정말로 설탕이 안들어갔다는 의미가 아닙니다. 1회 제공량에 0.5그램(g)의 설탕이 있다는 의미이므로, 너무 많은 무설탕 품목에 빠지지 않도록 조심하세요. + 건강한 몸무게로 유지하는 것은 혈당 수치를 관리하는 데에 도움이 됩니다. 의사, 영양사 그리고 헬스 트레이너가 몸무게 관리 계획에 도움을 줄 것입니다. + 혈액 수치를 측정하고 그 결과를 Glucosio앱을 통해 하루에 2번 추적하는 것은 음식과 생활 양식의 선택으로부터 나온 결과를 인식하는 데 도움을 줄 것입니다. + 지난 2 ~ 3개월동안의 평균 혈당 수치를 알아보려면 HbA1c 혈액 검사를 받으세요. 의사가 검사결과를 보고 이 검사를 얼마나 자주 받아야 할지 알려줄 것입니다. 탄수화물은 혈당 레벨에 영향을 미치므로 얼마나 많은 탄수화물을 소비하는지를 추적하는 것은 혈액 레벨을 확인하는 것 만큼 중요하다고 할 수 있습니다. 탄수화물 섭취에 관해 의사 또는 영양학자와 이야기해 보세요. - Controlling blood pressure, cholesterol, and triglyceride levels is important since diabetics are susceptible to heart disease. - There are several diet approaches you can take to eating healthier and helping improve your diabetes outcomes. Seek advice from a dietician on what will work best for you and your budget. - Working on getting regular exercise is especially important for those with diabetes and can help you maintain a healthy weight. Talk to your doctor about exercises that will be appropriate for you. - Being sleep-deprived can make you eat more especially things like junk food and as a result can negatively impact your health. Be sure to get a good night sleep and consult a sleep specialist if you are having difficulty. - Stress can have a negative impact on diabetes. Talk to your doctor or other health care professional about coping with stress. - Visiting your doctor once a year and having regular communication throughout the year is important for diabetics to prevent any sudden onset of associated health problems. + 당뇨병은 심장질환으로 이어지기 쉽기 때문에 혈압, 콜레스테롤, 트라이글리세라이드 수치를 관리하는 것이 중요합니다. + 식이요법중에는 더 건강한 식단이나 당뇨 수치 개선에 도움을 줄 수 있는 것들이 있습니다. 영양사와 상담하여 어떠한 식단이 적절한 예산안에서 당신에게 가장 유용할지 조언 받으시기 바랍니다. + 규칙적인 운동은 당뇨병 환자들에게 중요하며, 건강한 몸무게를 유지하는데에 도움을 줍니다. 의사와 상담하여 당신에게 적절한 운동에 대해 조언을 받으십시오. + 부족한 수면은 불량 식품 같은 것을 더 먹도록 하며, 이는 건강에 안좋은 영향을 끼치게 될 것입니다. 잠을 편히 잘 수 있도록 노력하시고, 만약 잠을 잘 못주무신다면 수면 전문가와 상담하시기 바랍니다. + 스트레스는 당뇨병에 부정적인 영향을 줄 수 있습니다. 담당 의사나 전문 의료진과 스트레스 대처법에 관해 상담하세요. + 의사에게 지속적으로 정기적인 상담을 받는 것은, 당뇨와 관련하여 일어날 수 있는 갑작스런 건강문제를 방지하기 위해 중요합니다. 비록 약 복용한지 조금 경과하여도 혈당 레벨에 영향을 주고 다른 부작용의 원인이 될지라도 의사에게 처방받은 대로 약을 복용합니다. 기억하기 어려운 경우에는 복약 관리 및 미리 알려주는 옵션에 대해 의사에게 요청합니다. + + 나이가 많은 당뇨병 환자는 당뇨와 관련된 건강문제에 큰 위험이 있을 수 있습니다. 당신의 나이에 존재하는 당뇨병의 문제와 어떤 것에 대해 조심해야 할 지 의사와 상담하시기 바랍니다. + 음식을 만들 때 사용하는 소금과 요리된 음식에 넣을 소금의 양을 제한합니다. + 보조 기능 지금 업데이트 네, 알겠습니다 의견 보내기 + 라이브 채팅 읽기 추가 지금 사용해 보기 체중 업데이트 @@ -130,26 +136,29 @@ Glucosio는 포도당 입력에 대한 디폴트 카테고리를 제공하지만 개별적인 요구에 맞추기 위해 설정에서 사용자정의 카테고리를 생성할 수 있습니다. 여기에서 자주 확인 Glucosio 보조는 정기적인 팁을 제공하며 지속적으로 개선되고 있습니다. 따라서 Glucosio 사용경험을 개선하고 다른 유용한 팁을 위해 취할 수 있는 유용한 작업에 대해 여기를 항상 확인해 주세요. - 피드백 보내기 기술적인 이슈를 찾거나 Glucosio에 대한 피드백이 있을 때 Glucosio를 개선하도록 돕기 위해 설정 메뉴에서 제출해 주시기를 권장합니다. 읽기 추가 주기적으로 포도당 읽기를 추가하여 시간이 지남에 따른 포도당 레벨을 추적하는 데 돕도록 해야 합니다. 데이터 내보내기 내보내기 기능을 사용하여 의사에게 데이터를 공유하거나 데이터를 Google Drive에 백업합니다. A1C 계산 + 이제 Glucosio의 HbA1c 계산기를 네비게이션 메뉴에서 사용하실 수 있습니다. 당신의 평균 혈액 포도당 수치를 입력하고 간단하게 HbA1c 값을 저장하세요. 선호 범위 사용자 정의 범위 최소값 최대값 언어 + 이메일 어플리케이션이 설치되어 있지 않습니다. hello@glucosio.org 로 직접 메일을 보내주시기 바랍니다. 다른 사람 초대 당뇨 관리 및 연구를 위한 오픈 소스 앱인 Glucosio를 사용해 보세요. Glucosio를 사용해 보세요 + 구글 드라이브 백업 개인 정보 Glucosio를 사용함으로써 다음 사항을 동의합니다 구글 드라이브 Glucosio에 대하여 Glucosio 등급 + 오픈소스 라이센스 FreeStyle Libre® 지원 활성화 실험 기능: FreeStyle Libre® 지원 활성화 실험 기능: 읽기 어려운 사용자에 대한 가독성 증가 @@ -187,6 +196,12 @@ 레슬링 하이킹 정원 일 + + + + + + 탄수화물: 단백질: @@ -215,6 +230,7 @@ 스크린샷을 갤러리에 저장하였습니다 스크린샷을 갤러리에 저장하는데 오류가 발생하였습니다 범위 내보내기 + 수치를 내보내는 중에 문제가 생겼습니다.\n다시 시도 하세요. 내보내기할 읽기가 없습니다. 새로운 읽기를 추가하였습니다 체중 @@ -228,10 +244,15 @@ 포도 당 독서를 추가 포도당 읽기 편집 몸무게 추가 + 몸무게 수정하기 콜레스테롤 레벨 추가 + 콜레스테롤 수치 수정하기 HBA1C 추가 + HbA1C 수정하기 케톤 추가 + 케톤 수정하기 혈압 추가 + 혈압 수정하기 신체 체중 케톤 혈압 @@ -240,20 +261,61 @@ 혈당 레벨 해당 시간에 대한 항목을 이미 갖고 있습니다. 수정사항을 추가하기 전에 먼저 삭제하십시오. 폰을 센서에 가져다대고 진동이 울릴 때까지 움직이지 마십시오. + 이 장치는 NFC를 지원하지 않습니다. NFC가 비활성화 되었습니다. + FreeStyle Libre®에서 추가하기 NFC 연결을 여는데 오류가 발생하였습니다! + FreeStyle Libre®에서 성공적으로 수치를 추가했습니다. HBA1C를 계산하기 위한 데이터가 충분하지 않습니다 HBA1C: + FreeStyle Libre®에서 추가하였습니다 평균 혈당 레벨 A1C A1C 계산기 저장 지원 + 어떻게 도와 드릴까요? Email 라이브 채팅 지원 포럼 혈당 레벨을 기록할 시간입니다! + 약을 복용할 시간입니다. + 이것은 추정치이며 지난달 기록의 평균으로 부터 계산되었습니다. 이 추정치는 HbA1c 추정치 계산에 널리 쓰이는 계산식을 사용한 것이므로 단순히 추정치로만 참고하시기 바랍니다. 참고 + 백업 및 내보내기 + 구글 드라이브에 백업 + 복원하기 + CSV 형식으로 내보내기 자동 백업 + 구글 드라이브에 당신의 데이터를 백업해서 당신이 장치를 잃어버렸거나 바꿨을때 당신의 수치들을 복원할 수 있습니다. + 변경 내용을 적용하기 위해 다시 시작합니다... + Google Drive와 Glucosio 데이터 베이스를 동기화 합니다. + Glucosio의 데이터를 동기화하면 기기를 잃어버리시거나 변경하시더라도 모든 기록을 복원할 수 있습니다. + 데이터베이스가 드라이브에 성공적으로 백업되었습니다 + 드라이브에서 성공적으로 데이터베이스를 복원하였습니다 + 문제가 발생했습니다. 다시 시도하십시오 :/ + 마지막 백업: + 백업 폴더 + 미설정 + 지금 백업하기 + 최근 백업 + 더 많은 백업들 보기 + 이전 버전으로 되돌리기 + 백업을 복원하면 모든 기존의 데이터를 덮어쓸 것입니다. + 백업 세부 정보 + 취소 + 백업 복원 + 드라이브에서 복원 + 드라이브에서 복원이 가능한 백업을 찾을 수 없습니다. + 구글드라이브에 백업하려면 구글 플레이 서비스를 사용 해야 합니다. + CSV 파일로 내보내기 + 드라이브 관리 + mmol/L mmol/L + 이전의 그래프로 되돌리기 + 히스토리 + 저장 + 알림 + 수치 추가 + 설정된 알람이 없습니다. 새로운 알람을 등록하세요. diff --git a/app/src/main/res/values-kok-rIN/strings.xml b/app/src/main/res/values-kok-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kok-rIN/strings.xml +++ b/app/src/main/res/values-kok-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ks-rIN/strings.xml b/app/src/main/res/values-ks-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ks-rIN/strings.xml +++ b/app/src/main/res/values-ks-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ks-rPK/strings.xml b/app/src/main/res/values-ks-rPK/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ks-rPK/strings.xml +++ b/app/src/main/res/values-ks-rPK/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ku-rTR/strings.xml b/app/src/main/res/values-ku-rTR/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ku-rTR/strings.xml +++ b/app/src/main/res/values-ku-rTR/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kv-rKO/strings.xml b/app/src/main/res/values-kv-rKO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kv-rKO/strings.xml +++ b/app/src/main/res/values-kv-rKO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-kw-rGB/strings.xml b/app/src/main/res/values-kw-rGB/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-kw-rGB/strings.xml +++ b/app/src/main/res/values-kw-rGB/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ky-rKG/strings.xml b/app/src/main/res/values-ky-rKG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ky-rKG/strings.xml +++ b/app/src/main/res/values-ky-rKG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-la-rLA/strings.xml b/app/src/main/res/values-la-rLA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-la-rLA/strings.xml +++ b/app/src/main/res/values-la-rLA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-lb-rLU/strings.xml b/app/src/main/res/values-lb-rLU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-lb-rLU/strings.xml +++ b/app/src/main/res/values-lb-rLU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-lg-rUG/strings.xml b/app/src/main/res/values-lg-rUG/strings.xml index 5a1d3c34..7fbb0752 100644 --- a/app/src/main/res/values-lg-rUG/strings.xml +++ b/app/src/main/res/values-lg-rUG/strings.xml @@ -65,9 +65,14 @@ Sabiiti Ekyikka Obuzito - Waayo endowooza yo + + + + + + Entunnmuusi diff --git a/app/src/main/res/values-li-rLI/strings.xml b/app/src/main/res/values-li-rLI/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-li-rLI/strings.xml +++ b/app/src/main/res/values-li-rLI/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-lij-rIT/strings.xml b/app/src/main/res/values-lij-rIT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-lij-rIT/strings.xml +++ b/app/src/main/res/values-lij-rIT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ln-rCD/strings.xml b/app/src/main/res/values-ln-rCD/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ln-rCD/strings.xml +++ b/app/src/main/res/values-ln-rCD/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-lo-rLA/strings.xml b/app/src/main/res/values-lo-rLA/strings.xml index 77b8a559..21036c7b 100644 --- a/app/src/main/res/values-lo-rLA/strings.xml +++ b/app/src/main/res/values-lo-rLA/strings.xml @@ -136,7 +136,6 @@ Glucosio ມາພ້ອມກັບປະເພດກລູໂຄສແບບພື້ນຖານ ແຕ່ວ່າທ່ານສາມາດສ້າງຂື້ນມາໃຫມ່ໃນກາານຕັ້ງຄ່າເພື່ອໃຫ້ເຫມາະສົມກັບຄວາມຕ້ອງການຂອງທ່ານ. ໃຫ້ເຂົ້າມາກວດເບິງຢູ່ນີ້ຢ່າງເປັນປົກກະຕິ ຜູ້ຊ່ວຍ Glucosio ຈະສະຫນອງເຄັດລັບຕ່າງໆ ແລະ ປັບປຸງມັນຢ່າງເປັນປະຈຳ. ສະນັ້ນມັນເຂົ້າມາກວດສອບຢູ່ນີ້ສຳລັບຂໍ້ມູນທີ່ສຳຄັນຕ່າງໆທີ່ທ່ານສາມາດນຳເອົາໄປປັບປຸງປະສົບການໃຊ້ງານ Glucosio ຂອງທ່ານ ແລະ ເຄັດລັບອື່ນໆທີ່ເປັນປະໂຫຍດ. - ສົ່ງຄໍາຄິດເຫັນ ເພື່ອເປັນການຊ່ວຍໃຫ້ເຮົາສາມາດປັບປຸງ Glucosio ໃຫ້ດີຂື້ນ ຫາກວ່າທ່ານພົບເຫັນບັນຫາທາງເຕັກນິກ ຫລື ຄຳແນະນຳໃດໆ ທ່ານສາມາດສົ່ງຂໍ້ມູນມາໃຫ້ພວກເຮົາໄດ້ໃນເມນູການຕັ້ງຄ່າ. ເພີ່ມການອ່ານ ກວດສອບເບິງໃຫ້ແນ່ໃຈວ່າໄດ້ບັນທຶກລະດັບນ້ຳຕານກລູໂຄສເປັນປະຈຳ ເພື່ອທີ່ພວກເຮົາຈະສາມາດຊ່ວຍທ່ານຕິດຕາມລະດັບນ້ຳຕານກລູໂຄສຕະລອດເວລາ. @@ -198,6 +197,12 @@ ກິລາມວຍປໍ້າ ການຢ່າງຫລີ້ນໄລຍະໃກ ອະນາໄມເດີນບ້ານ + + + + + + ທາດຄາໂບໄຮເດຣທ: ທາດໂປຣຕີນ: @@ -312,7 +317,6 @@ ປະຫວັດການນຳໃຊ້ ບັນທຶກ ການແຈ້ງເຕືອນ - ເຖິງເວລາບັນທຶກລະດັບນໍ້າຕານຂອງທ່ານ! ເພີ່ມການອ່ານ ບໍ່ໄດ້ຕັ້ງຄ່າການແຈ້ງເຕືອນ. ເພີ່ມການແຈ້ງເຕືອນໃຫມ່ໄດ້ບ່ອນນີ້. diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-luy-rKE/strings.xml b/app/src/main/res/values-luy-rKE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-luy-rKE/strings.xml +++ b/app/src/main/res/values-luy-rKE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-lv-rLV/strings.xml +++ b/app/src/main/res/values-lv-rLV/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mai-rIN/strings.xml b/app/src/main/res/values-mai-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-mai-rIN/strings.xml +++ b/app/src/main/res/values-mai-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-me-rME/strings.xml b/app/src/main/res/values-me-rME/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-me-rME/strings.xml +++ b/app/src/main/res/values-me-rME/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mg-rMG/strings.xml b/app/src/main/res/values-mg-rMG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-mg-rMG/strings.xml +++ b/app/src/main/res/values-mg-rMG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mh-rMH/strings.xml b/app/src/main/res/values-mh-rMH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-mh-rMH/strings.xml +++ b/app/src/main/res/values-mh-rMH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mi-rNZ/strings.xml b/app/src/main/res/values-mi-rNZ/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-mi-rNZ/strings.xml +++ b/app/src/main/res/values-mi-rNZ/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mk-rMK/strings.xml b/app/src/main/res/values-mk-rMK/strings.xml index 50d49dcf..aba874ba 100644 --- a/app/src/main/res/values-mk-rMK/strings.xml +++ b/app/src/main/res/values-mk-rMK/strings.xml @@ -73,6 +73,12 @@ ДОДАЈ МЕРЕЊЕ + + + + + + diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml index 55c7e975..0c89655b 100644 --- a/app/src/main/res/values-ml-rIN/strings.xml +++ b/app/src/main/res/values-ml-rIN/strings.xml @@ -82,6 +82,12 @@ ഇപ്പോൾ പുതുക്കുക + + + + + + തൂക്കം diff --git a/app/src/main/res/values-mn-rMN/strings.xml b/app/src/main/res/values-mn-rMN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-mn-rMN/strings.xml +++ b/app/src/main/res/values-mn-rMN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-moh-rCA/strings.xml b/app/src/main/res/values-moh-rCA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-moh-rCA/strings.xml +++ b/app/src/main/res/values-moh-rCA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mos/strings.xml b/app/src/main/res/values-mos/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-mos/strings.xml +++ b/app/src/main/res/values-mos/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml index 492bbda9..0bdf5074 100644 --- a/app/src/main/res/values-mr-rIN/strings.xml +++ b/app/src/main/res/values-mr-rIN/strings.xml @@ -65,6 +65,12 @@ वजन + + + + + + वजन diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ms-rMY/strings.xml +++ b/app/src/main/res/values-ms-rMY/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-mt-rMT/strings.xml b/app/src/main/res/values-mt-rMT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-mt-rMT/strings.xml +++ b/app/src/main/res/values-mt-rMT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-my-rMM/strings.xml b/app/src/main/res/values-my-rMM/strings.xml index 221250b7..e3e702ec 100644 --- a/app/src/main/res/values-my-rMM/strings.xml +++ b/app/src/main/res/values-my-rMM/strings.xml @@ -122,7 +122,6 @@ ဂလူးကို့စ် အချက်အလက်အတွက် Glucosio က ပုံသေ ကဏ္ဍများဖြင့် ထည့်သွင်းထားပါသည် သို့ရာတွင် သင်၏လိုအပ်ချက်နှင့် ကိုက်ညီရန် စိတ်ကြိုက်ကဏ္ဍများကို အပြင်အဆင်များထဲတွင် ဖန်တီးနိုင်ပါသည်. ဒီနေရာကို မကြာခဏ စစ်ဆေးပါ Glucosio လက်ထောက်သည် ပုံမှန်အကြံပြုချက်များကို ပေးပါသည်။ ထို့ပြင် ဆက်လက်တိုးတက်အောင် ဆောင်ရွက်နေပါသည်။ ထို့ကြောင့် သင့်Glucosio သုံးစွဲမှုအတွေ့အကြုံများနှင့် အခြားအသုံးဝင်သည့် အကြံပြုချက်များအတွက် သင်ဆောင်ရွက်နိုင်သည်များကို အဲဒီမှာ အမြဲ လာရောက်ကြည့်ရှုပါ။ - အကြံပြုချက် ပေးပို့ရန် နည်းပညာ အခက်အခဲများ သို့မဟုတ် Glucosio နှင့် ပတ်သက်၍ တုံ့ပြန်လိုပါက Glucosio ကို ပိုမိုကောင်းမွန်ဖို့ ကူညီရန် အပြင်အဆင် စာရင်းတွင် ကျွန်ုပ်တို့ကို ပေးပို့ပါ. ပြန်ဆိုချက် တစ်ခု ထည့်ပါ သင်၏ ဂလူးကို့စ် ဖတ်ခြင်းကို ပုံမှန် ဖြစ်အောင်လုပ်ပေးပါ အဲလိုဆိုရင် ကျွန်ုပ်တို့က သင်၏ဂလူးကို့စ် ပမာဏကို အချိန်တိုင်း စောင့်ကြည့်ဖို့ ကူညီမှာပါ. @@ -177,6 +176,12 @@ နပန်း ခရီး​ဝေးလမ်း​လျှောက်ခြင်း ခြံရှင်းအလုပ် + + + + + + ကစီဓါတ်ပါ​သော အစာများ အသားဓါတ် diff --git a/app/src/main/res/values-na-rNR/strings.xml b/app/src/main/res/values-na-rNR/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-na-rNR/strings.xml +++ b/app/src/main/res/values-na-rNR/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-nds-rDE/strings.xml b/app/src/main/res/values-nds-rDE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-nds-rDE/strings.xml +++ b/app/src/main/res/values-nds-rDE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ne-rNP/strings.xml b/app/src/main/res/values-ne-rNP/strings.xml index 7017b116..13691db0 100644 --- a/app/src/main/res/values-ne-rNP/strings.xml +++ b/app/src/main/res/values-ne-rNP/strings.xml @@ -76,10 +76,15 @@ ल ठिक छ आफ्नो वजन अद्यावधिक गर्नुहोस् विभाग सिर्जना - प्रतिक्रिया बुझाउनुहोस् रुचाइएको सीमा + + + + + + diff --git a/app/src/main/res/values-ng-rNA/strings.xml b/app/src/main/res/values-ng-rNA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ng-rNA/strings.xml +++ b/app/src/main/res/values-ng-rNA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 5c69feac..3df037bf 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -46,7 +46,7 @@ Glucose-eenheid van voorkeur mg/dl mmol/l - A1C-eenheid van voorkeur + HbA1c-eenheid van voorkeur percentage Gewichtseenheid van voorkeur kilogram @@ -71,7 +71,7 @@ Bedtijd Nacht Nuchtere glucose - Opnieuw controleren + Nieuwe controle Anders ANNULEREN TOEVOEGEN @@ -108,7 +108,7 @@ Suikervrij betekent niet echt suikervrij. Het betekent 0,5 gram (g) suiker per portie, dus voorkom dat u zich met te veel suikervrije items verwent. Streven naar een gezond gewicht helpt bloedsuikers te beheersen. Uw arts, een diëtist en een fitnesstrainer kunnen u op weg helpen met een schema dat voor u werkt. Twee maal per dag controleren en bijhouden van uw bloedspiegel in een app als Glucosio helpt u bewust te worden van resultaten van keuzes in voedsel en levensstijl. - Vraag om A1c-bloedtests om achter uw gemiddelde bloedsuikerspiegel van de afgelopen 2 tot 3 maanden te komen. Uw arts kan vertellen hoe vaak deze test dient te worden uitgevoerd. + Vraag om HbA1c-bloedtests om achter uw gemiddelde bloedsuikerspiegel van de afgelopen 2 tot 3 maanden te komen. Uw arts kan vertellen hoe vaak deze test dient te worden uitgevoerd. Bijhouden hoeveel koolhydraten u verbruikt kan net zo belangrijk zijn als het controleren van bloedspiegels, omdat koolhydraten bloedsuikerspiegels beïnvloeden. Praat met uw arts of een diëtist over de inname van koolhydraten. Het beheersen van bloeddruk-, cholesterol- en triglyceridenniveaus is belangrijk, omdat diabetici gevoelig zijn voor hartziekten. Er zijn diverse dieetbenaderingen die u kunt nemen om gezonder te eten en uw diabetesresultaten te verbeteren. Zoek advies bij een diëtist over wat het beste voor u en uw budget werkt. @@ -137,14 +137,13 @@ Glucosio bevat standaardcategorieën voor glucose-invoer, maar in de instellingen kunt u eigen categorieën maken die aan uw unieke behoeften voldoen. Kijk hier regelmatig Glucosio-assistent levert regelmatig tips en wordt continu verbeterd, dus kijk altijd hier voor nuttige acties die u kunt nemen om uw Glucosio-ervaring te verbeteren en voor andere nuttige tips. - Feedback indienen Als u technische problemen tegenkomt of feedback over Glucosio hebt, zien we graag dat u deze indient om Glucosio te helpen verbeteren. Een uitlezing toevoegen Zorg ervoor dat u regelmatig uw glucose-uitlezingen toevoegt, zodat we kunnen helpen uw glucosegehalten na verloop van tijd bij te houden. Uw gegevens exporteren Deel uw gegevens met uw arts of plaats een back-up ervan op Google Drive via de exportfunctie. - A1C berekenen - Glucosio’s ingebouwde A1C-calculator is nu in het zijmenu beschikbaar. Voer uw gemiddelde bloedsuikerspiegel in en sla direct de berekende A1C-waarde op. + HbA1c berekenen + Glucosio’s ingebouwde HbA1c-calculator is nu in het zijmenu beschikbaar. Voer uw gemiddelde bloedsuikerspiegel in en sla direct de berekende HbA1c-waarde op. Voorkeursbereik Aangepast bereik Min. waarde @@ -199,6 +198,12 @@ Worstelen Wandelen Tuinieren + + + + + + Koolhydraten: Proteïnen: @@ -226,7 +231,7 @@ Glucosio heeft een opslagmachtiging nodig om een schermafbeelding op te slaan Schermafbeelding opgeslagen naar galerij Fout bij opslaan van schermafbeelding naar galerij - Exportbereik + Bereik exporteren Er was een probleem bij het exporteren van de uitlezingen. Probeer het opnieuw. Geen uitlezingen te exporteren. Nieuwe uitlezing toegevoegd @@ -237,15 +242,15 @@ Totale cholesterol LDL-cholesterol HDL-cholesterol - HB1AC + HbA1c Glucose-uitlezing toevoegen Glucose-uitlezing bewerken Lichaamsgewicht toevoegen Lichaamsgewicht bewerken Cholesterolspiegel toevoegen Cholesterolniveau bewerken - HB1AC toevoegen - HBA1C bewerken + HbA1c toevoegen + HbA1c bewerken Ketonen toevoegen Ketonen bewerken Bloeddruk toevoegen @@ -254,7 +259,7 @@ Ketonen Bloeddruk Cholesterolspiegel - HB1AC-uitlezing + HbA1c-uitlezing Bloedsuikerspiegel U hebt al een vermelding voor deze tijd. Verwijder deze voordat u een correctie toevoegt. Houd uw telefoon voor de sensor en beweeg niet totdat deze trilt. @@ -263,12 +268,12 @@ Toevoegen vanuit FreeStyle Libre® Fout bij openen van NFC-verbinding! Uitlezing met succes toegevoegd vanuit FreeStyle Libre® - Onvoldoende gegevens om HBA1C te berekenen - HBA1C: + Onvoldoende gegevens om HbA1c te berekenen + HbA1c: Toegevoegd vanuit uw FreeStyle Libre® GEMIDDELDE BLOEDSUIKERSPIEGEL - A1C - A1C-calculator + HbA1c + HbA1c-calculator OPSLAAN Ondersteuning Hoe kunnen we u helpen? @@ -277,7 +282,7 @@ Ondersteuningsforum Het is tijd om uw bloedsuikerspiegel vast te leggen! Het is tijd voor uw medicatie! - Dit is slechts een schatting en is berekend op basis van de gemiddelden van uitlezingen in de afgelopen maand. Hoewel deze schatting een algemeen erkende formule voor HbA1C-schatting gebruikt, raden we gebruikers aan om dit alleen als een schatting te gebruiken. + Dit is slechts een schatting en is berekend op basis van de gemiddelden van uitlezingen in de afgelopen maand. Hoewel deze schatting een algemeen erkende formule voor HbA1c-schatting gebruikt, raden we gebruikers aan dit alleen als een schatting te gebruiken. Notities Back-up maken en exporteren Back-up maken op Google Drive @@ -313,7 +318,6 @@ geschiedenis opslaan Herinneringen - Tijd om uw glucosespiegel vast te leggen! Uitlezing toevoegen Geen herinneringen ingesteld. Voeg hier nieuwe herinneringen toe. diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-nn-rNO/strings.xml +++ b/app/src/main/res/values-nn-rNO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-nr-rZA/strings.xml b/app/src/main/res/values-nr-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-nr-rZA/strings.xml +++ b/app/src/main/res/values-nr-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ns-rZA/strings.xml b/app/src/main/res/values-ns-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ns-rZA/strings.xml +++ b/app/src/main/res/values-ns-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ny-rMW/strings.xml b/app/src/main/res/values-ny-rMW/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ny-rMW/strings.xml +++ b/app/src/main/res/values-ny-rMW/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-oc-rFR/strings.xml b/app/src/main/res/values-oc-rFR/strings.xml index 66b946f6..923aef76 100644 --- a/app/src/main/res/values-oc-rFR/strings.xml +++ b/app/src/main/res/values-oc-rFR/strings.xml @@ -68,6 +68,12 @@ D\'acòrdi + + + + + + Pes diff --git a/app/src/main/res/values-oj-rCA/strings.xml b/app/src/main/res/values-oj-rCA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-oj-rCA/strings.xml +++ b/app/src/main/res/values-oj-rCA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-om-rET/strings.xml b/app/src/main/res/values-om-rET/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-om-rET/strings.xml +++ b/app/src/main/res/values-om-rET/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-or-rIN/strings.xml +++ b/app/src/main/res/values-or-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-os-rSE/strings.xml b/app/src/main/res/values-os-rSE/strings.xml index 62045343..15550bbb 100644 --- a/app/src/main/res/values-os-rSE/strings.xml +++ b/app/src/main/res/values-os-rSE/strings.xml @@ -39,6 +39,12 @@ ОК + + + + + + Email diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml index 06c377fb..85c0845b 100644 --- a/app/src/main/res/values-pa-rIN/strings.xml +++ b/app/src/main/res/values-pa-rIN/strings.xml @@ -117,7 +117,6 @@ ਵਰਗ ਬਣਾਓ ਗਲੂਕੋਜ਼ ਇਨਪੁੱਟ ਲਈ Glucosio ਮੂਲ ਵਰਗਾਂ ਨਾਲ ਆਉਂਦਾ ਹੈ ਪਰ ਤੁਸੀਂ ਆਪਣੀਆਂ ਜ਼ਰੂਰਤਾਂ ਮੁਤਾਬਿਕ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਤਰਜੀਹੀ ਵਰਗ ਬਣਾ ਸਕਦੇ ਹੋ। ਇੱਥੇ ਅਕਸਰ ਵੇਖੋ - ਫੀਡਬੈਕ ਭੇਜੋ ਜੇਕਰ ਤੁਹਾਨੂ ਕੋਈ ਤਕਨੀਕੀ ਸਮੱਸਿਆ ਆਈ ਜਾਂ Glucosio ਬਾਰੇ ਫੀਡਬੈਕ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ Glucosio ਨੂੰ ਵਧੀਆ ਬਣਾਉਣ ਵਿੱਚ ਸਾਡੀ ਸਹਾਇਤਾ ਲਈ ਅਸੀਂ ਤੁਹਾਨੂੰ ਇਸ ਨੂੰ ਸੈਟਿੰਗ ਮੀਨੂੰ ਤੋਂ ਭੇਜਣ ਲਈ ਉਤਸ਼ਾਹਿਤ ਕਰਦੇ ਹਾਂ। ਰੀਡਿੰਗ ਸ਼ਾਮਲ ਕਰੋ ਨਿਯਮਿਤ ਤੌਰ ਤੇ ਆਪਣੀ ਗਲੋਕੂਜ਼ ਰੀਡਿੰਗ ਸ਼ਾਮਲ ਕਰਨਾ ਯਕੀਨੀ ਬਣਾਓ ਤਾਂ ਕੀ ਅਸੀਂ ਤੁਹਾਡੀ ਗਲੂਕੋਜ਼ ਪੱਧਰਾਂ ਤੇ ਨਜ਼ਰ ਰੱਖਣ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰ ਸਕੀਏ। @@ -127,6 +126,12 @@ ਵੱਧੋ-ਵੱਧ ਮੁੱਲ + + + + + + ਭਾਰ diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 06c377fb..85c0845b 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -117,7 +117,6 @@ ਵਰਗ ਬਣਾਓ ਗਲੂਕੋਜ਼ ਇਨਪੁੱਟ ਲਈ Glucosio ਮੂਲ ਵਰਗਾਂ ਨਾਲ ਆਉਂਦਾ ਹੈ ਪਰ ਤੁਸੀਂ ਆਪਣੀਆਂ ਜ਼ਰੂਰਤਾਂ ਮੁਤਾਬਿਕ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਤਰਜੀਹੀ ਵਰਗ ਬਣਾ ਸਕਦੇ ਹੋ। ਇੱਥੇ ਅਕਸਰ ਵੇਖੋ - ਫੀਡਬੈਕ ਭੇਜੋ ਜੇਕਰ ਤੁਹਾਨੂ ਕੋਈ ਤਕਨੀਕੀ ਸਮੱਸਿਆ ਆਈ ਜਾਂ Glucosio ਬਾਰੇ ਫੀਡਬੈਕ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ Glucosio ਨੂੰ ਵਧੀਆ ਬਣਾਉਣ ਵਿੱਚ ਸਾਡੀ ਸਹਾਇਤਾ ਲਈ ਅਸੀਂ ਤੁਹਾਨੂੰ ਇਸ ਨੂੰ ਸੈਟਿੰਗ ਮੀਨੂੰ ਤੋਂ ਭੇਜਣ ਲਈ ਉਤਸ਼ਾਹਿਤ ਕਰਦੇ ਹਾਂ। ਰੀਡਿੰਗ ਸ਼ਾਮਲ ਕਰੋ ਨਿਯਮਿਤ ਤੌਰ ਤੇ ਆਪਣੀ ਗਲੋਕੂਜ਼ ਰੀਡਿੰਗ ਸ਼ਾਮਲ ਕਰਨਾ ਯਕੀਨੀ ਬਣਾਓ ਤਾਂ ਕੀ ਅਸੀਂ ਤੁਹਾਡੀ ਗਲੂਕੋਜ਼ ਪੱਧਰਾਂ ਤੇ ਨਜ਼ਰ ਰੱਖਣ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰ ਸਕੀਏ। @@ -127,6 +126,12 @@ ਵੱਧੋ-ਵੱਧ ਮੁੱਲ + + + + + + ਭਾਰ diff --git a/app/src/main/res/values-pam-rPH/strings.xml b/app/src/main/res/values-pam-rPH/strings.xml index ad3e2137..11828fac 100644 --- a/app/src/main/res/values-pam-rPH/strings.xml +++ b/app/src/main/res/values-pam-rPH/strings.xml @@ -117,7 +117,6 @@ Ang Glucosio ay mga kategoryang kalakip para sa glucose input, ngunit maaari kang gumawa ng sarili mong kategorya kung nanaisin. Pumunta dito ng madalas Nagbibigay ang Glucosio assistant ng mga payo kung paano gaganda ang iyong kalusugan at kung paano mo makukuha ang benepisyo ng paggamit ng Glucosio. - I-submit ang feedback Kung may mga katanungang pangteknikal or may mga puna at suhesyon para sa Glucosio, pumunta sa settings menu. Magdagdag ng reading Siguraduhing palaging magdagdag ng iyong glucose readings para ikaw matulungan naming i-track ang iyong glucose levels. @@ -127,6 +126,12 @@ Max value + + + + + + Timbang diff --git a/app/src/main/res/values-pap/strings.xml b/app/src/main/res/values-pap/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-pap/strings.xml +++ b/app/src/main/res/values-pap/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-pcm-rNG/strings.xml b/app/src/main/res/values-pcm-rNG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-pcm-rNG/strings.xml +++ b/app/src/main/res/values-pcm-rNG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-pi-rIN/strings.xml b/app/src/main/res/values-pi-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-pi-rIN/strings.xml +++ b/app/src/main/res/values-pi-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index e2094fe1..3e28ebbe 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -71,6 +71,12 @@ 1 czytanie usunięte + + + + + + diff --git a/app/src/main/res/values-ps-rAF/strings.xml b/app/src/main/res/values-ps-rAF/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ps-rAF/strings.xml +++ b/app/src/main/res/values-ps-rAF/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ba424118..e006680f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -26,6 +26,7 @@ Visão geral Histórico Dicas + Adicionar nova leitura Olá. Olá. Termos de uso. @@ -135,7 +136,6 @@ Glucosio vem com categorias padrão para a entrada de glicose, mas você pode criar categorias personalizadas nas configurações para atender às suas necessidades exclusivas. Confira aqui frequentemente O assistente Glucosio fornece dicas regulares e vai continuar melhorando, portanto, sempre confira aqui ações úteis que você pode tomar para melhorar a sua experiência com o Glucosio e outras dicas úteis. - Enviar comentários Se você encontrar quaisquer problemas técnicos ou tiver comentários sobre o Glucosio, nós encorajamos você a apresentá-los no menu de configuraçõesm, a fim de nos ajudar a melhorar o Glucosio. Adicionar uma leitura Não se esqueça de adicionar regularmente as leituras de glicemia, para podermos ajudá-lo a controlar seus níveis de glicemia ao longo do tempo. @@ -197,6 +197,12 @@ Luta Caminhada Jardinagem + + + + + + Carboidratos: Proteína: @@ -225,6 +231,7 @@ Captura de tela salva na galeria Erro ao salvar a captura de tela na galeria Intervalo de exportação + Houve um problema ao exportar as leituras. Por favor, tente novamente. Nenhuma leitura para exportar. Nova leitura adicionada Peso @@ -238,10 +245,15 @@ Adicionar leitura de glicose Editar leitura de glicose Adicionar o peso corporal + Editar peso corporal Adicionar o nível de colesterol + Editar nível de colesterol Adicionar HB1AC + Editar HbA1c Adicionar cetonas + Editar cetonas Adicionar a pressão arterial + Editar pressão arterial Peso corporal Cetonas Pressão arterial @@ -285,6 +297,7 @@ Algo deu errado. Por favor, tente novamente :/ Último backup: Pasta de backup + Indefinido Fazer o backup agora Backups recentes Ver mais backups @@ -300,4 +313,10 @@ Editar no Drive mmol/mol mmol/L + Reverter para o gráfico antigo + histórico + salvar + Lembretes + Adicionar leitura + Nenhum conjunto de lembretes. Adicione um novo lembrete aqui. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-qu-rPE/strings.xml b/app/src/main/res/values-qu-rPE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-qu-rPE/strings.xml +++ b/app/src/main/res/values-qu-rPE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-quc-rGT/strings.xml b/app/src/main/res/values-quc-rGT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-quc-rGT/strings.xml +++ b/app/src/main/res/values-quc-rGT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-qya-rAA/strings.xml b/app/src/main/res/values-qya-rAA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-qya-rAA/strings.xml +++ b/app/src/main/res/values-qya-rAA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-rm-rCH/strings.xml b/app/src/main/res/values-rm-rCH/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-rm-rCH/strings.xml +++ b/app/src/main/res/values-rm-rCH/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-rn-rBI/strings.xml b/app/src/main/res/values-rn-rBI/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-rn-rBI/strings.xml +++ b/app/src/main/res/values-rn-rBI/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 3a5e8bc7..57b03dac 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -69,7 +69,7 @@ Gustare Ora de culcare Noapte - Nivel de glucoză pe nemâncate + Nivel de glucoză pe nemâncate (preprandial) Reverifică Altceva RENUNȚĂ @@ -136,7 +136,6 @@ Glucosio vine cu categorii implicite pentru glucoză, dar puteţi crea categorii particularizate în setări pentru a se potrivi nevoilor dumneavoastră unice. Reveniți des Asistentul Glucosio oferă sfaturi regulate şi se va îmbunătăți, astfel încât întotdeauna reveniți aici pentru acţiuni utile pe care puteţi lua pentru a îmbunătăţi experienţa dumneavoastră Glucosio şi pentru alte sfaturi utile. - Trimite feedback Dacă găsiţi orice probleme tehnice sau aveți feedback despre Glucosio vă recomandăm să-l trimiteți prin meniul de setări, pentru a ne ajuta să îmbunătăţim Glucosio. Adaugă o citire Asigură-te că adaugi în mod regulat citirile de glucoză ca să te putem ajuta să urmărești nivelul de glucoză în timp. @@ -198,6 +197,12 @@ Lupte Drumeții Muncă în curte + + + + + + Carbohidrați: Proteine: @@ -226,6 +231,7 @@ Captură salvată în galerie Eroare la salvarea capturii în galerie Exportă în intervalul + A existat o problema la exportul citirilor. Va rugam sa incercati din nou. Nu sunt citiri de exportat. Noua citire a fost adăugată Greutate @@ -308,4 +314,5 @@ mmol/mol mmol/L Revino la graficul vechi + istoric diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 1fcbccc9..405ae50f 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -136,7 +136,6 @@ Glucosio содержит категории по умолчанию, но в настройках вы можете создать собственные категории так, чтобы они подходили под ваши нужды. Регулярно обращайтесь сюда Помощник Glucosio предоставляет регулярные советы. Мы работаем над усовершенствованием нашего помощника, поэтому обращайтесь сюда за советами, которые вы сможете использовать для того, чтобы получить большую пользу от Glucosio, а также за другими полезными советами. - Отправьте отзыв Если вы обнаружите какие-либо технические проблемы или захотите отправить отзыв о работе Glucosio, вы можете сделать это в меню настроек. Это поможет нам улучшить Glucosio. Добавить данные Регулярно вводите данные об уровне глюкозы, в течением времени это поможет вам отслеживать уровень глюкозы. @@ -198,6 +197,12 @@ Борьба Пешие прогулки Работа во дворе + + + + + + Углеводы: Белок: @@ -312,7 +317,6 @@ история сохранить Напоминания - Пора зарегистрировать ваш уровень глюкозы! Добавить данные Нет напоминаний. Добавьте новое напоминание здесь. diff --git a/app/src/main/res/values-rw-rRW/strings.xml b/app/src/main/res/values-rw-rRW/strings.xml index f24e26c3..d40c223b 100644 --- a/app/src/main/res/values-rw-rRW/strings.xml +++ b/app/src/main/res/values-rw-rRW/strings.xml @@ -56,6 +56,12 @@ Ongeraho + + + + + + mmol/L diff --git a/app/src/main/res/values-ry-rUA/strings.xml b/app/src/main/res/values-ry-rUA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ry-rUA/strings.xml +++ b/app/src/main/res/values-ry-rUA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sa-rIN/strings.xml b/app/src/main/res/values-sa-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sa-rIN/strings.xml +++ b/app/src/main/res/values-sa-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sat-rIN/strings.xml b/app/src/main/res/values-sat-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sat-rIN/strings.xml +++ b/app/src/main/res/values-sat-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sc-rIT/strings.xml b/app/src/main/res/values-sc-rIT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sc-rIT/strings.xml +++ b/app/src/main/res/values-sc-rIT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sco-rGB/strings.xml b/app/src/main/res/values-sco-rGB/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sco-rGB/strings.xml +++ b/app/src/main/res/values-sco-rGB/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sd-rPK/strings.xml b/app/src/main/res/values-sd-rPK/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sd-rPK/strings.xml +++ b/app/src/main/res/values-sd-rPK/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-se-rNO/strings.xml b/app/src/main/res/values-se-rNO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-se-rNO/strings.xml +++ b/app/src/main/res/values-se-rNO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sg-rCF/strings.xml b/app/src/main/res/values-sg-rCF/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sg-rCF/strings.xml +++ b/app/src/main/res/values-sg-rCF/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sh-rHR/strings.xml b/app/src/main/res/values-sh-rHR/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sh-rHR/strings.xml +++ b/app/src/main/res/values-sh-rHR/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-si-rLK/strings.xml +++ b/app/src/main/res/values-si-rLK/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 0fc59a01..18ae01a8 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -111,7 +111,6 @@ Aktualizujte vašu hmotnosť Uistite sa, aby bola vaša váha vždy aktuálna, aby mal Glucosio čo najpresnejšie údaje. Vytvoriť kategórie - Odoslať spätnú väzbu Ak nájdete nejaké technické problémy, alebo nám chcete zanechať spätnú väzbu o Glucosio odporúčame vám ju odoslať cez položku v nastaveniach. Pomôžete tak vylepšiť Glucosio. Pridať meranie Uistite sa, aby ste pravidelne pridávali hodnoty hladiny glykémie tak, aby sme vám mohli pomôcť priebežne sledovať hladiny glukózy. @@ -127,6 +126,12 @@ Používaním Glucosio sa zaväzujete, že + + + + + + Váha diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml index fdca8a3c..889da02b 100644 --- a/app/src/main/res/values-sl-rSI/strings.xml +++ b/app/src/main/res/values-sl-rSI/strings.xml @@ -136,7 +136,6 @@ Aplikacija Glucosio ima privzete kategorije za vnos glukoze, vendar si lahko ustvarite svoje lastne kategorije in jih v nastavitvah uredite, da bodo ustrezale vašim potrebam. Pogosto preverite Asistent v aplikaciji Glucosio vam redno ponuja nasvete. Ker se zavedamo pomembnosti, ga bomo redno nadgrajevali, zato ga večkrat preverite in se seznanite z nasveti, ki bodo omogočili boljšo uporabniško izkušnjo in vam bili v dodatno pomoč. - Pošlji povratno informacijo Če boste imeli katero koli tehnično vprašanje ali povratno informacijo, vas prosimo, da nam jo pošljete preko menija v nastavitvah. Samo tako bomo lahko aplikacijo Glucosio redno izboljševali. Dodaj meritev Poskrbite, da redno dodajate vaše odčitke glukoze, da vam lahko pomagamo slediti vaši ravni glukoze. @@ -198,6 +197,12 @@ Rokoborba Pohodništvo Delo na vrtu + + + + + + Ogljikovi hidrati: Beljakovine: @@ -312,7 +317,6 @@ zgodovina shrani Opomniki - Čas je za beleženje vaše ravni glukoze! Dodaj meritev Opomniki niso nastavljeni. Tu dodajte novega. diff --git a/app/src/main/res/values-sma-rNO/strings.xml b/app/src/main/res/values-sma-rNO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sma-rNO/strings.xml +++ b/app/src/main/res/values-sma-rNO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sn-rZW/strings.xml b/app/src/main/res/values-sn-rZW/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sn-rZW/strings.xml +++ b/app/src/main/res/values-sn-rZW/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-so-rSO/strings.xml b/app/src/main/res/values-so-rSO/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-so-rSO/strings.xml +++ b/app/src/main/res/values-so-rSO/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-son-rZA/strings.xml b/app/src/main/res/values-son-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-son-rZA/strings.xml +++ b/app/src/main/res/values-son-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sq-rAL/strings.xml b/app/src/main/res/values-sq-rAL/strings.xml index ec4b9071..01be21a0 100644 --- a/app/src/main/res/values-sq-rAL/strings.xml +++ b/app/src/main/res/values-sq-rAL/strings.xml @@ -135,7 +135,6 @@ Glucosio vjenë me kategori të parazgjedhura për inputet e glukozës por ju mund të krijoni kategori të zakonshme tek parametrat që të përputhen me nevojat tuaja të veçanta. Kontrolloni këtu shpesh Ndihmësi nga Glucosio siguron këshilla të rregullta dhe do vazhdojë të përmirësohet, kështu që gjithmonë kontrolloni këtu për veprime të dobishme që mund të kryeni për të përmirësuar eksperiencën tuaj me Glucosio dhe për këshilla të tjera të dobishme. - Dërgo komente Nëse keni ndonjë problem teknik ose doni të ndani përshtypjen tuaj rreth Glucosio ne ju inkurajojm që ti dërgoni ato në menun e parametrave në mënyrë që të na ndihmoni që ta përmirësojmë Glucosion. Shto një lexim Sigurohuni që ti shtoni rregullisht leximet tuaja rreth glukozës në mënyrë që ne të mund t\'ju ndihmojm të gjurmoni nivelet tuaja të glukozës me kalimin e kohës. @@ -197,6 +196,12 @@ Mundje Udhëtim i gjetë në këmbë Punë në kopsht + + + + + + Karbohidrate: Proteina: diff --git a/app/src/main/res/values-sr-rCS/strings.xml b/app/src/main/res/values-sr-rCS/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sr-rCS/strings.xml +++ b/app/src/main/res/values-sr-rCS/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ss-rZA/strings.xml b/app/src/main/res/values-ss-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ss-rZA/strings.xml +++ b/app/src/main/res/values-ss-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-st-rZA/strings.xml b/app/src/main/res/values-st-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-st-rZA/strings.xml +++ b/app/src/main/res/values-st-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-su-rID/strings.xml b/app/src/main/res/values-su-rID/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-su-rID/strings.xml +++ b/app/src/main/res/values-su-rID/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-sv-rFI/strings.xml b/app/src/main/res/values-sv-rFI/strings.xml index 81bf925a..383831be 100644 --- a/app/src/main/res/values-sv-rFI/strings.xml +++ b/app/src/main/res/values-sv-rFI/strings.xml @@ -122,7 +122,6 @@ Glucosio levereras med standardkategorier för glukos-indata, men du kan skapa egna kategorier i inställningarna för att matcha dina unika behov. Kolla här ofta Glucosio assistent ger regelbundna tips och kommer att fortsätta att förbättras, så kontrolera alltid här för nyttiga åtgärder som du kan vidta för att förbättra din erfarenhet av Glucosio och andra användbara tips. - Skicka in feedback Om du hittar några tekniska problem eller har synpunkter om Glucosio rekommenderar vi att du skickar in den i inställningsmenyn för att hjälpa oss att förbättra Glucosio. Lägga till ett värde Var noga med att regelbundet lägga till dina glukosvärden så att vi kan hjälpa dig att spåra dina glukosnivåer över tiden. @@ -174,6 +173,12 @@ Brottning Vandring Gårdsarbete + + + + + + Kolhydrater: Protein: diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 690f6796..6469c22e 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -122,7 +122,6 @@ Glucosio levereras med standardkategorier för glukos-indata, men du kan skapa egna kategorier i inställningarna för att matcha dina unika behov. Kolla här ofta Glucosio assistent ger regelbundna tips och kommer att fortsätta att förbättras, så kontrolera alltid här för nyttiga åtgärder som du kan vidta för att förbättra din erfarenhet av Glucosio och andra användbara tips. - Skicka in feedback Om du hittar några tekniska problem eller har synpunkter om Glucosio rekommenderar vi att du skickar in den i inställningsmenyn för att hjälpa oss att förbättra Glucosio. Lägga till ett värde Var noga med att regelbundet lägga till dina glukosvärden så att vi kan hjälpa dig att spåra dina glukosnivåer över tiden. @@ -174,6 +173,12 @@ Brottning Vandring Gårdsarbete + + + + + + Kolhydrater: Protein: diff --git a/app/src/main/res/values-sw-rKE/strings.xml b/app/src/main/res/values-sw-rKE/strings.xml index abc4fe12..11be644a 100644 --- a/app/src/main/res/values-sw-rKE/strings.xml +++ b/app/src/main/res/values-sw-rKE/strings.xml @@ -109,6 +109,12 @@ Sasisha uzito wako + + + + + + Uzito diff --git a/app/src/main/res/values-sw-rTZ/strings.xml b/app/src/main/res/values-sw-rTZ/strings.xml index 860984b6..10b3f08b 100644 --- a/app/src/main/res/values-sw-rTZ/strings.xml +++ b/app/src/main/res/values-sw-rTZ/strings.xml @@ -116,7 +116,6 @@ Glucosio yaja na makundi yaliyoundwa tayari kwa ajili ya kuingiza kiwango cha glukosi ila unaweza pia kutengeneza makundi maalum kwneye mpangilio ili kuendana na upekee wa mahitaji yako. Angalia hapa mara nyingi Wasaidizi wa Glucosio hutoa vidokezo vya mara kwa mara ambavyo vitaendelea kuboreshwa, kwa hivyo angalia hapa mara kwa mara ilikuchua nini cha kufanya ili kuboresha uzoefu wako wa Glucosio na kwa kupata vidokezo vingine muhimu. - Wasilisha mrejesho Kama una tatizo lolote la kiufundi au mrejesho wowote kuhusu Glucosio tunakutia moyo uyawasilishe kwenye menyu ya mpangilio ili tuweze kuboresha Glucosio. Ongeza kipimo Hakikisha kwamba una ongeza idadi ya kipimo cha glukosi kilichopo mwilini kila wakati ili tukusaidie kufautilia viwango vyako vya glukosi muda kwa muda. @@ -126,6 +125,12 @@ Thamani ya juu + + + + + + diff --git a/app/src/main/res/values-syc-rSY/strings.xml b/app/src/main/res/values-syc-rSY/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-syc-rSY/strings.xml +++ b/app/src/main/res/values-syc-rSY/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml index 899c5c0b..f98f611c 100644 --- a/app/src/main/res/values-ta-rIN/strings.xml +++ b/app/src/main/res/values-ta-rIN/strings.xml @@ -62,6 +62,12 @@ விருப்ப அளவீடு வகை + + + + + + diff --git a/app/src/main/res/values-tay-rTW/strings.xml b/app/src/main/res/values-tay-rTW/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-tay-rTW/strings.xml +++ b/app/src/main/res/values-tay-rTW/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-te-rIN/strings.xml b/app/src/main/res/values-te-rIN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-te-rIN/strings.xml +++ b/app/src/main/res/values-te-rIN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-tg-rTJ/strings.xml b/app/src/main/res/values-tg-rTJ/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-tg-rTJ/strings.xml +++ b/app/src/main/res/values-tg-rTJ/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml index bd2f397f..f6fef3bb 100644 --- a/app/src/main/res/values-th-rTH/strings.xml +++ b/app/src/main/res/values-th-rTH/strings.xml @@ -101,7 +101,6 @@ อัพเดตเดี๋ยวนี้ ได้ ฉันเข้าใจ ปรับปรุงน้ำหนักของคุณ - ส่งคำติชม ในการที่จะช่วยให้เราปรับปรุง Glucosio หากคุณพบปัญหาทางเทคนิคหรือมีข้อเสนอแนะใด ๆ คุณสามารถส่งข้อมูลให้เราได้ในเมนูการตั้งค่า เพิ่มข้อมูล ตรวจสอบให้แน่ใจว่าได้บันทึกระดับน้ำตาลกลูโคสเป็นประจำ เพื่อที่เราสามารถช่วยคุณติดตามระดับน้ำตาลกลูโคสตลอดเวลา @@ -111,6 +110,12 @@ ค่าสูงสุด + + + + + + น้ำหนัก diff --git a/app/src/main/res/values-ti-rER/strings.xml b/app/src/main/res/values-ti-rER/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ti-rER/strings.xml +++ b/app/src/main/res/values-ti-rER/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-tk-rTM/strings.xml b/app/src/main/res/values-tk-rTM/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-tk-rTM/strings.xml +++ b/app/src/main/res/values-tk-rTM/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-tl-rPH/strings.xml b/app/src/main/res/values-tl-rPH/strings.xml index 703722e8..0bfdea13 100644 --- a/app/src/main/res/values-tl-rPH/strings.xml +++ b/app/src/main/res/values-tl-rPH/strings.xml @@ -97,6 +97,12 @@ + + + + + + diff --git a/app/src/main/res/values-tn-rZA/strings.xml b/app/src/main/res/values-tn-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-tn-rZA/strings.xml +++ b/app/src/main/res/values-tn-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 2814bba1..6eb4afeb 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -131,7 +131,6 @@ Glucosio glikoz girişi için varsayılan kategoriler bulundurmaktadır ancak benzersiz gereksinimlerinize ayarlarında özel kategoriler oluşturabilirsiniz. Burayı sık sık kontrol et Glucosio Yardımcısı düzenli ipuçları sağlar ve ilerlemeyi kaydeder, bu yüzden her zaman burayı, Glucosio deneyiminizi geliştirmek için yapabileceğiniz faydalı işlemler ve diğer yararlı ipuçları için kontrol edin. - Geribildirim Gönder Eğer herhangi bir teknik sorun bulursanız veya Glucosio hakkında geribildiriminiz varsa Glucosio\'yu geliştirmemize yardımcı olmak için Ayarlar menüsünden geribildirim göndermeyi öneririz. Bir okuma Ekle Glikoz değerlerinizi düzenli olarak eklediğinizden emin olun böylece glikoz seviyenizi takip edebilelim. @@ -180,6 +179,12 @@ Dağ tırmanışı Güreş Bahçe işleri + + + + + + Karbonhidrat: Protein: diff --git a/app/src/main/res/values-ts-rZA/strings.xml b/app/src/main/res/values-ts-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ts-rZA/strings.xml +++ b/app/src/main/res/values-ts-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-tt-rRU/strings.xml b/app/src/main/res/values-tt-rRU/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-tt-rRU/strings.xml +++ b/app/src/main/res/values-tt-rRU/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-tw-rTW/strings.xml b/app/src/main/res/values-tw-rTW/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-tw-rTW/strings.xml +++ b/app/src/main/res/values-tw-rTW/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ty-rPF/strings.xml b/app/src/main/res/values-ty-rPF/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ty-rPF/strings.xml +++ b/app/src/main/res/values-ty-rPF/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-tzl/strings.xml b/app/src/main/res/values-tzl/strings.xml index 2a28fbd3..29428f61 100644 --- a/app/src/main/res/values-tzl/strings.xml +++ b/app/src/main/res/values-tzl/strings.xml @@ -45,6 +45,12 @@ Axhutor + + + + + + diff --git a/app/src/main/res/values-ug-rCN/strings.xml b/app/src/main/res/values-ug-rCN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ug-rCN/strings.xml +++ b/app/src/main/res/values-ug-rCN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index ac0ba740..340e1669 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -123,7 +123,6 @@ Оновити свою вагу Не забудьте оновити свою вагу, аби Glucosio мав найточнішу інформацію. Додати категорії - Відправити відгук Якщо ви знайшли будь-які технічні недоліки або хочете написати відгук про Glucosio то ви можете зробити це в меню \"Параметри\", що допоможе нам покращити Glucosio. Додати вимірювання Переконайтеся, що ви регулярно подаєте ваші показники глюкози, щоб ми могли допомогти вам відстежувати ваш рівень глюкози з часом. @@ -171,6 +170,12 @@ Боротьба Піші прогулянки Роботу у дворі + + + + + + Вуглеводи: Протеїн: diff --git a/app/src/main/res/values-ur-rPK/strings.xml b/app/src/main/res/values-ur-rPK/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ur-rPK/strings.xml +++ b/app/src/main/res/values-ur-rPK/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-uz-rUZ/strings.xml b/app/src/main/res/values-uz-rUZ/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-uz-rUZ/strings.xml +++ b/app/src/main/res/values-uz-rUZ/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-val-rES/strings.xml b/app/src/main/res/values-val-rES/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-val-rES/strings.xml +++ b/app/src/main/res/values-val-rES/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-ve-rZA/strings.xml b/app/src/main/res/values-ve-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-ve-rZA/strings.xml +++ b/app/src/main/res/values-ve-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-vec-rIT/strings.xml b/app/src/main/res/values-vec-rIT/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-vec-rIT/strings.xml +++ b/app/src/main/res/values-vec-rIT/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index 6e610978..8c3f5b1a 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -113,6 +113,12 @@ Leo núi Đấu vật Đi bộ đường dài + + + + + + Xuất dữ liệu diff --git a/app/src/main/res/values-vls-rBE/strings.xml b/app/src/main/res/values-vls-rBE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-vls-rBE/strings.xml +++ b/app/src/main/res/values-vls-rBE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-wa-rBE/strings.xml b/app/src/main/res/values-wa-rBE/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-wa-rBE/strings.xml +++ b/app/src/main/res/values-wa-rBE/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-wo-rSN/strings.xml b/app/src/main/res/values-wo-rSN/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-wo-rSN/strings.xml +++ b/app/src/main/res/values-wo-rSN/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-xh-rZA/strings.xml b/app/src/main/res/values-xh-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-xh-rZA/strings.xml +++ b/app/src/main/res/values-xh-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-yo-rNG/strings.xml b/app/src/main/res/values-yo-rNG/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-yo-rNG/strings.xml +++ b/app/src/main/res/values-yo-rNG/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-zea/strings.xml b/app/src/main/res/values-zea/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-zea/strings.xml +++ b/app/src/main/res/values-zea/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 70bf1c8c..a4a52489 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -27,6 +27,7 @@ 概览 历史记录 小提示 + 添加新读数 你好 你好 使用条款。 @@ -87,6 +88,7 @@ 关于 这些实验性功能不保证能稳定工作，仅面向早期测试用户。您可以摇动手机以给我们发送反馈。 版本 + 即将到来…… 使用条款 类型 体重 @@ -134,7 +136,6 @@ Glucosio 默认带有血糖读数分类，您还可以在设置中创建自定义的分类以满足您的独特需求。 经常检查这里 Glucosio 助理提供定期的提示并将不断改善，因此请经常检查这里的提示，这有助您采取措施来提高使用 Glucosio 的经验和技巧。 - 提交反馈 如果您发现了任何技术问题，或有关于 Glucosio 的反馈，我们鼓励您在设置菜单中提交它，以帮助我们改进 Glucosio。 添加阅读 一定要定期添加您的血糖读数，以便我们帮助您随时间跟踪您的血糖水平。 @@ -196,6 +197,12 @@ 摔跤 徒步旅行 院子里工作 + + + + + + 碳水化合物: 蛋白质: @@ -224,6 +231,7 @@ 截图已保存到图库 保存截图到图库出错 导出范围 + 导出读数出错。请再试一次。 没有读数可导出。 新读数已添加 体重 @@ -235,11 +243,17 @@ 高密度脂蛋白胆固醇 糖化血红蛋白 添加血糖读数 + 编辑血糖读数 增加体重 + 编辑体重 添加胆固醇水平 + 编辑胆固醇水平 添加糖化血红蛋白 + 编辑 HbA1c 添加酮体 + 编辑酮 添加血压 + 编辑血压 体重 酮体 血压 @@ -267,16 +281,40 @@ 支持论坛 该记录您的血糖水平了！ 现在是您的服药时间！ + 备注 备份和导出 在 Google Drive 上备份 恢复 CSV 导出 + 自动备份 + 备份您的数据到谷歌驱动器允许您恢复您的读数，以防丢失或变更设备。 重启以应用更改... 用 Google Drive 云同步 Glucosio 的数据库。 如果您丢失或者变更手机，或者在您的设备之间同步 Glucosio 的数据，将可以恢复您的所有读数。 + 数据库已成功备份到谷歌驱动器 + 驱动器已成功从谷歌数据库恢复 出现错误。请重试。 + 上次备份： + 备份文件夹 + 未设置 立即备份 + 最近的备份 + 查看更多备份 + 恢复到以前的版本 + 恢复备份将使用备份覆盖现有的所有数据。 + 备份详细信息 + 取消 + 恢复备份 从 Drive 恢复 无法在 Drive 找到有效的备份以恢复 + Glucosio 需要 Play 服务才能启用谷歌驱动器备份。 + 导出到 CSV 文件 + 在 Drive 上管理 毫摩尔/升 + 回到旧图 + 历史 + 保存 + 提醒 + 添加读数 + 未设置提醒。在这里添加新的提示。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 651e7e47..01bc8b06 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -135,7 +135,6 @@ Glucosio 有一些血糖值的預設分類，您也還是可以在設定中自訂分類來滿足您的需求。 常看看這裡 Glucosio 血糖小幫手提供控制血糖的小祕訣，並會持續改善。請常回來看看有沒有什麼能改善您的 Glucosio 使用體驗的新鮮事，或是其他有用的小祕訣。 - 送出意見回饋 若您發現任何技術問題，或是對 Glucosio 有任何意見想說，我們相當歡迎您在設定選單告訴我們，以幫助我們改善 Glucosio。 新增測量值 務必定期紀錄血糖測量值，這樣才能幫助您追蹤血糖值。 @@ -197,6 +196,12 @@ 摔跤 登山 園藝工作 + + + + + + 碳水化合物: 蛋白質: diff --git a/app/src/main/res/values-zu-rZA/strings.xml b/app/src/main/res/values-zu-rZA/strings.xml index 5ad451ae..2a3b7f4f 100644 --- a/app/src/main/res/values-zu-rZA/strings.xml +++ b/app/src/main/res/values-zu-rZA/strings.xml @@ -22,6 +22,12 @@ + + + + + + diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml new file mode 100644 index 00000000..fb4f5a76 --- /dev/null +++ b/app/src/main/res/values/ids.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e5727f0..1d9df1dc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -159,7 +159,7 @@ About Here be dragons :/ These features are experimental and may not fully work and are for early testing by users. Remember that you can shake your phone to send us feedback. - 1.3.0 (Chutney) + 1.3.1 (Chutney) Version Coming soon... Terms of use @@ -318,7 +318,48 @@ Hiking Yard work - + + + Welcome to Glucosio! + Glucosio is a free and open source app for managing your diabetes + Logging and Trends + Glucosio makes logging glucose levels and visualizing trends easy + Support Diabetes Research + Glucosio allows you to opt-in to sharing anonymous trends with academic diabetes researchers + Privacy Focused + Glucosio takes your privacy seriously and only shares undidenfiable trends if you opt-in + Improved Health Outcomes + Glucosio helps you track your glucose level trends and other health metrics for improved health outcomes + + + + + Your glucose levels yesterday were great! + Your glucose levels this week have been terrific! + Your morning time glucose level was perfect! + Your afternoon glucose level was perfect! + + + + + + Great Week + You achieved the one week of in range glucose levels badge! Great job! + Great Month + You achieved the one month of in range glucose levels badge! Great job! + Data Export + You achieved the data export badge for being a user who likes data portability! Great job! + Logged 100 + You achieved the logged 100 glucose readings badge! Great job! + Logged 250 + You achieved the logged 250 glucose readings badge! Great job! + Logged 500 + You achieved the logged 500 glucose readings badge! Great job! + 7-Days + You achieved the 7-Days of consistent glucose level logging badge! Great job! + + + Carbs: Protein: diff --git a/app/src/test/java/org/glucosio/android/GlucosioTestRunner.java b/app/src/test/java/org/glucosio/android/GlucosioTestRunner.java deleted file mode 100644 index 9e234412..00000000 --- a/app/src/test/java/org/glucosio/android/GlucosioTestRunner.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.glucosio.android; - -import org.junit.runners.model.InitializationError; -import org.robolectric.RobolectricGradleTestRunner; -import org.robolectric.manifest.AndroidManifest; -import org.robolectric.manifest.BroadcastReceiverData; - -import java.util.ArrayList; -import java.util.List; - -public class GlucosioTestRunner extends RobolectricGradleTestRunner { - public GlucosioTestRunner(Class klass) throws InitializationError { - super(klass); - } - - @Override - protected AndroidManifest getAppManifest(org.robolectric.annotation.Config config) { - AndroidManifest manifest = super.getAppManifest(config); - List broadcastReceivers = manifest.getBroadcastReceivers(); - List removeList = new ArrayList<>(); - for (BroadcastReceiverData receiverData : broadcastReceivers) { - if (receiverData.getClassName().toLowerCase().contains("instabug")) { - removeList.add(receiverData); - } - } - broadcastReceivers.removeAll(removeList); - return manifest; - } -} diff --git a/app/src/test/java/org/glucosio/android/RobolectricTest.java b/app/src/test/java/org/glucosio/android/RobolectricTest.java index 0333e5cd..764152d5 100644 --- a/app/src/test/java/org/glucosio/android/RobolectricTest.java +++ b/app/src/test/java/org/glucosio/android/RobolectricTest.java @@ -9,10 +9,11 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; @Ignore -@RunWith(GlucosioTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 21, packageName = "org.glucosio.android") +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 21) public abstract class RobolectricTest { protected Analytics getAnalytics() { return getTestApplication().getAnalytics(); diff --git a/app/src/test/java/org/glucosio/android/adapter/BackupAdapterTest.java b/app/src/test/java/org/glucosio/android/adapter/BackupAdapterTest.java new file mode 100644 index 00000000..bd46547a --- /dev/null +++ b/app/src/test/java/org/glucosio/android/adapter/BackupAdapterTest.java @@ -0,0 +1,52 @@ +package org.glucosio.android.adapter; + +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.google.android.gms.drive.DriveId; + +import org.glucosio.android.R; +import org.glucosio.android.RobolectricTest; +import org.glucosio.android.object.GlucosioBackup; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.robolectric.Robolectric; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.assertj.android.api.Assertions.assertThat; +import static org.mockito.MockitoAnnotations.initMocks; + +public class BackupAdapterTest extends RobolectricTest { + private AppCompatActivity activity; + private ViewGroup viewGroup; + private BackupAdapter adapter; + + @Mock + private DriveId driveIDMock; + + @Before + public void setUp() throws Exception { + initMocks(this); + + activity = Robolectric.buildActivity(AppCompatActivity.class).create().get(); + viewGroup = (ViewGroup) activity.findViewById(android.R.id.content); + + List backupsArray = new ArrayList<>(); + backupsArray.add(new GlucosioBackup(driveIDMock, new Date(), 1024)); + adapter = new BackupAdapter(activity, R.layout.preferences_backup, backupsArray); + } + + @Test + public void ReturnViewWithSizeFormatted_WhenAsked() throws Exception { + View view = adapter.getView(0, null, viewGroup); + + TextView sizeView = (TextView) view.findViewById(R.id.item_history_type); + assertThat(sizeView).hasText("1.00KB"); + } +} diff --git a/app/src/test/java/org/glucosio/android/presenter/A1CCalculatorPresenterTest.java b/app/src/test/java/org/glucosio/android/presenter/A1CCalculatorPresenterTest.java index 2cc8ef67..4acb58fc 100644 --- a/app/src/test/java/org/glucosio/android/presenter/A1CCalculatorPresenterTest.java +++ b/app/src/test/java/org/glucosio/android/presenter/A1CCalculatorPresenterTest.java @@ -13,6 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.verify; @RunWith(MockitoJUnitRunner.class) public class A1CCalculatorPresenterTest { @@ -56,7 +57,34 @@ public void ShouldReturnZero_WhenAnotherDecimalSeparatorStringPassed() throws Ex } @Test - public void ShouldReturnNonZero_WhenAnotherDecimalSeparatorStringPassed() throws Exception { - assertThat(presenter.calculateA1C("2")).isNotZero(); + public void ShouldCalculatable_WhenUserPreferredMmol() throws Exception { + when(userMock.getPreferred_unit()).thenReturn("mmol/L"); + assertThat(presenter.calculateA1C("1")).isEqualTo(2.25); } -} \ No newline at end of file + + @Test + public void ShouldCalculatable_WhenUserPreferredPercentage() throws Exception { + when(userMock.getPreferred_unit_a1c()).thenReturn("mmol/mol"); + assertThat(presenter.calculateA1C("20")).isEqualTo(1.84); + } + + @Test + public void ShouldCallSetMmol_WhenUserPreferredUnitIsNotMgDl() throws Exception { + when(userMock.getPreferred_unit()).thenReturn("mmol/L"); + presenter.checkGlucoseUnit(); + verify(activity).setMmol(); + } + + @Test + public void ShouldReturnCorrectA1CUnit_WhenGetterCalled() throws Exception { + when(userMock.getPreferred_unit_a1c()).thenReturn("mmol/mol"); + assertThat(presenter.getA1cUnit()).isEqualTo("mmol/mol"); + } + + @Test + public void ShouldFinishActivityAfterSaving_WhensaveA1CCalled() throws Exception { + when(userMock.getPreferred_unit_a1c()).thenReturn("mmol/mol"); + presenter.saveA1C(presenter.calculateA1C("20")); + verify(activity).finish(); + } +} diff --git a/app/src/test/java/org/glucosio/android/presenter/ExportPresenterTest.java b/app/src/test/java/org/glucosio/android/presenter/ExportPresenterTest.java index b4203b7c..b5865f60 100644 --- a/app/src/test/java/org/glucosio/android/presenter/ExportPresenterTest.java +++ b/app/src/test/java/org/glucosio/android/presenter/ExportPresenterTest.java @@ -31,7 +31,7 @@ public class ExportPresenterTest extends RobolectricTest { @Before public void setUp() throws Exception { initMocks(this); - when(dbHandlerMock.getGlucoseReading(anyLong())).thenReturn(glucoseReadingMock); + when(dbHandlerMock.getGlucoseReadingById(anyLong())).thenReturn(glucoseReadingMock); when(glucoseReadingMock.getNotes()).thenReturn(MOCK_NOTE_FOR_TEST); when(glucoseReadingMock.getCreated()).thenReturn(new Date()); when(glucoseReadingMock.getReading()).thenReturn(TEST_READING_VALUE); diff --git a/app/src/test/java/org/glucosio/android/presenter/ExternalViewPresenterTest.java b/app/src/test/java/org/glucosio/android/presenter/ExternalViewPresenterTest.java index f2bb5fcd..921e8b15 100644 --- a/app/src/test/java/org/glucosio/android/presenter/ExternalViewPresenterTest.java +++ b/app/src/test/java/org/glucosio/android/presenter/ExternalViewPresenterTest.java @@ -1,16 +1,19 @@ package org.glucosio.android.presenter; +import org.glucosio.android.BuildConfig; +import org.glucosio.android.RobolectricTest; import org.glucosio.android.tools.network.GlucosioExternalLinks; import org.glucosio.android.tools.network.NetworkConnectivity; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class ExternalViewPresenterTest { +public class ExternalViewPresenterTest extends RobolectricTest { private ExternalViewPresenter.View view; private ExternalViewPresenter presenter; @@ -22,16 +25,12 @@ public class ExternalViewPresenterTest { presenter = new ExternalViewPresenter(view, network); } - @Test + @Test(expected = IllegalArgumentException.class) public void shouldThrowException_WhenNoParameters() throws Exception { when(network.isConnected()).thenReturn(true); when(view.extractTitle()).thenReturn(null); - - try { - presenter.onViewCreated(); - } catch (Exception ex) { - assertTrue(ex instanceof IllegalArgumentException); - } + when(view.extractUrl()).thenReturn(null); + presenter.onViewCreated(); } @Test public void shouldLoadOpenSourceLicenses_WhenLicenseParameters() throws Exception { @@ -45,4 +44,11 @@ public void shouldThrowException_WhenNoParameters() throws Exception { verify(view).loadExternalUrl(GlucosioExternalLinks.LICENSES); verify(view).setupToolbarTitle(LICENSES); } + + @Test + public void shouldInvokeShowNoConnectionWarning_WhenNetworkIsNotConnected() throws Exception { + when(network.isConnected()).thenReturn(false); + presenter.onViewCreated(); + verify(view).showNoConnectionWarning(); + } } \ No newline at end of file diff --git a/app/src/test/java/org/glucosio/android/presenter/HelloPresenterTest.java b/app/src/test/java/org/glucosio/android/presenter/HelloPresenterTest.java index 1e810851..01bc3c6a 100644 --- a/app/src/test/java/org/glucosio/android/presenter/HelloPresenterTest.java +++ b/app/src/test/java/org/glucosio/android/presenter/HelloPresenterTest.java @@ -82,6 +82,24 @@ public void ShouldAskForWarning_WhenAgeIsNotNumber() throws Exception { verify(dbHandlerMock, never()).addUser(any(User.class)); } + @Test + public void ShouldAskForWarning_WhenAgeIsEmpty() throws Exception { + + presenter.onNextClicked("", null, null, null, -1, null); + + verify(helloViewMock).displayErrorWrongAge(); + verify(dbHandlerMock, never()).addUser(any(User.class)); + } + + @Test + public void ShouldAskForWarning_WhenAgeIsNull() throws Exception { + + presenter.onNextClicked(null, null, null, null, -1, null); + + verify(helloViewMock).displayErrorWrongAge(); + verify(dbHandlerMock, never()).addUser(any(User.class)); + } + @Test public void ShouldPropagateAllValues_WhenSavingUser() throws Exception { diff --git a/app/src/test/java/org/glucosio/android/tools/ReadingToCSVTest.java b/app/src/test/java/org/glucosio/android/tools/ReadingToCSVTest.java new file mode 100644 index 00000000..d70d9b53 --- /dev/null +++ b/app/src/test/java/org/glucosio/android/tools/ReadingToCSVTest.java @@ -0,0 +1,190 @@ +package org.glucosio.android.tools; + +import android.content.Context; +import android.content.res.Resources; +import android.os.Environment; + +import static org.powermock.api.mockito.PowerMockito.mock; +import static org.powermock.api.mockito.PowerMockito.mockStatic; +import static org.powermock.api.mockito.PowerMockito.when; + + +import org.glucosio.android.R; +import org.glucosio.android.db.GlucoseReading; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.internal.util.io.IOUtil; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + +import io.realm.Realm; + +/** + * Created by david on 30/10/16. + */ + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ReadingToCSV.class, Realm.class, Environment.class}) +public class ReadingToCSVTest { + + private Context context; + + private Realm realm; + + private File tmpFolderForTesting; + private File glucosioFolder; + + private FormatDateTime dateTool; + + @Before + public void setUp() { + realm = mock(Realm.class); + context = mock(Context.class); + + dateTool = new FormatDateTime(context); + + final Resources resources = mock(Resources.class); + when(resources.getString(Matchers.anyInt())).thenAnswer(new Answer() { + @Override + public String answer(InvocationOnMock invocation) throws Throwable { + return String.valueOf(invocation.getArguments()[0]); + } + }); + + when(context.getResources()).thenReturn(resources); + + File tmpDir = new File(System.getProperty("java.io.tmpdir")); + + tmpFolderForTesting = new File(tmpDir, UUID.randomUUID().toString()); + + // Create the folder for glucosio + glucosioFolder = new File(tmpFolderForTesting, "glucosio"); + glucosioFolder.mkdirs(); + + Assert.assertTrue(glucosioFolder.exists() && glucosioFolder.isDirectory()); + + mockStatic(Environment.class); + when(Environment.getExternalStorageDirectory()).thenReturn(tmpDir); + when(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)).thenReturn(tmpFolderForTesting); + } + + @After + public void clean() { + removeFolder(tmpFolderForTesting); + } + + private void removeFolder(File folder) { + if (!folder.exists() || !folder.isDirectory()) { + return; + } + final File[] files = folder.listFiles(); + if (files != null) { + for (int i = 0; i < files.length; i++) { + File f = files[i]; + if (f.isDirectory()) { + removeFolder(f); + } else { + files[i].delete(); + } + } + } + folder.delete(); + } + + @Test + public void whenNoDataGeneratesEmptyCSVWithHeader() throws IOException { + final ReadingToCSV r = createReadingToCSV("mg/dL"); + final String path = r.createCSVFile(realm, new ArrayList()); + + assertFileContentEqualsToString(path, headerAsString()); + } + + @Test + public void whenOneDataGeneratesCSVWithHeaderAndOneLine() throws IOException { + final Date created = new Date(); + + List values = new ArrayList<>(); + values.add(new GlucoseReading(80, "type", created, "notes")); + + final ReadingToCSV r = createReadingToCSV("mg/dL"); + final String path = r.createCSVFile(realm, values); + + assertFileContentEqualsToString(path, headerAsString(), valuesAsString(values.get(0), "mg/dL")); + } + + private ReadingToCSV createReadingToCSV(String um) { + return new ReadingToCSV(context, um); + } + + private String headerAsString() { + return new StringBuilder().append(R.string.dialog_add_date) + .append(',') + .append(R.string.dialog_add_time) + .append(',') + .append(R.string.dialog_add_concentration) + .append(',') + .append(R.string.helloactivity_spinner_preferred_glucose_unit) + .append(',') + .append(R.string.dialog_add_measured) + .append(',') + .append(R.string.dialog_add_notes) + .toString(); + } + + private String valuesAsString(GlucoseReading reading, String units) { + return new StringBuilder().append(dateTool.convertRawDate(reading.getCreated())) + .append(',') + .append(dateTool.convertRawTime(reading.getCreated())) + .append(',') + .append(reading.getReading()) + .append(',') + .append(units) + .append(',') + .append(reading.getReading_type()) + .append(',') + .append(reading.getNotes()) + .toString(); + } + + private void assertFileContentEqualsToString(String path, String... expectedValues) throws IOException { + Assert.assertNotNull(path); + + final File file = new File(path); + Assert.assertTrue(file.exists() && file.isFile()); + + InputStream is = new FileInputStream(file); + try { + Collection lines = IOUtil.readLines(is); + + Assert.assertEquals(expectedValues.length, lines.size()); + + Iterator iterator = lines.iterator(); + + for (int i = 0; i < lines.size(); i++) { + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(expectedValues[i], iterator.next()); + } + + } finally { + IOUtil.closeQuietly(is); + } + } + +} diff --git a/build.gradle b/build.gradle index 6cf04163..3683951c 100644 --- a/build.gradle +++ b/build.gradle @@ -27,11 +27,11 @@ buildscript { dependencies { // TODO: Please revert to a stable gradle version before releasing on prod // Alpha is required in devel to use Instant Run and speed up development process - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.3.0-beta1' classpath 'com.google.gms:google-services:3.0.0' - classpath 'io.realm:realm-gradle-plugin:1.1.1' + classpath 'io.realm:realm-gradle-plugin:1.2.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.7.1' classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' classpath 'org.jacoco:org.jacoco.core:0.7.7.201606060606' // NOTE: Do not place your application dependencies here; they belong @@ -43,20 +43,20 @@ allprojects { jcenter() } - ext.buildToolsVer = '25.0.0' + ext.buildToolsVer = '25.0.1' - ext.androidSupportVer = '25.0.0' - ext.googlePlayServicesVer = '9.4.0' + ext.androidSupportVer = '25.1.0' + ext.googlePlayServicesVer = '10.0.1' - ext.butterKnifeVer = '8.0.1' + ext.butterKnifeVer = '8.4.0' ext.junitVer = '4.12' - ext.mockitoVer = '1.10.17' + ext.mockitoVer = '1.10.19' ext.androidAssertJVer = '1.1.1' - ext.robolectricVer = '3.0' + ext.robolectricVer = '3.2' apply plugin: 'com.github.ben-manes.versions' } task wrapper(type: Wrapper) { gradleVersion = '2.13' -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f34d1082..c08c32b3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Aug 06 17:49:05 CEST 2016 +#Tue Jan 03 15:21:53 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/wear/build.gradle b/wear/build.gradle index 02c235f5..46d7cddb 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -29,8 +29,8 @@ android { applicationId "org.glucosio.android" minSdkVersion 21 targetSdkVersion 25 - versionCode 38 - versionName '1.3.0' + versionCode 39 + versionName '1.3.1' } buildTypes { debug {