Skip to content

Commit

Permalink
Updated changelog
Browse files Browse the repository at this point in the history
Added missing translations
  • Loading branch information
Faltenreich committed Jun 10, 2019
1 parent bb4ef33 commit 63de293
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@
import android.view.MenuItem;
import android.view.View;

import androidx.annotation.IdRes;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;

import com.faltenreich.diaguard.BuildConfig;
import com.faltenreich.diaguard.R;
import com.faltenreich.diaguard.data.PreferenceHelper;
Expand All @@ -28,14 +37,6 @@
import com.github.clans.fab.FloatingActionButton;
import com.google.android.material.navigation.NavigationView;

import androidx.annotation.IdRes;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import butterknife.BindView;

public class MainActivity extends BaseActivity implements OnFragmentChangeListener {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package com.faltenreich.diaguard.ui.fragment;

import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;

import com.faltenreich.diaguard.R;
import com.faltenreich.diaguard.ui.activity.CategoriesActivity;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;

import com.faltenreich.diaguard.R;

public class ChangelogFragment extends DialogFragment {

@NonNull
Expand All @@ -19,14 +17,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getContext())
.setTitle(R.string.changelog)
.setMessage(R.string.changelog_desc)
.setNegativeButton(R.string.change_now, (dlg, which) -> openCategoryPreference())
.setPositiveButton(R.string.ok, (dlg, which) -> { })
.create();
}

private void openCategoryPreference() {
if (getContext() != null) {
getContext().startActivity(new Intent(getContext(), CategoriesActivity.class));
}
}
}
3 changes: 2 additions & 1 deletion Diaguard/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
<string name="oxygen_saturation">Sauerstoffsättigung</string>

<string name="changelog">Neu in dieser Version</string>
<string name="changelog_desc">Die Reihenfolge der Kategorien kann ab sofort über die Einstellungen geändert werden.</string>
<string name="changelog_desc">Insulin kann während des PDF Exports ab sofort in Bolus, Korrektur und Basal unterteilt werden.</string>

<string name="meal_factor">Mahlzeit-Bolus-Faktor</string>
<string name="meal_factors">Mahlzeit-Bolus-Faktoren</string>
Expand Down Expand Up @@ -341,6 +341,7 @@
<string name="change_now">Jetzt ändern</string>
<string name="help">Hilfe</string>
<string name="category_preference_desc">Aktiv:\nKategorie wird angezeigt oder ausgeblendet\n\nFixiert:\nKategorie wird bei neuen Einträgen automatisch vorausgewählt\n\nSortieren:\nSechs-Punkte-Symbol gedrückt halten und nach oben oder unten ziehen</string>
<string name="insulin_split">Insulin aufteilen</string>

<string name="theme">Farbschema</string>
<string name="theme_light">Hell</string>
Expand Down
3 changes: 2 additions & 1 deletion Diaguard/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
<string name="correction_value_desc">La reducción de glucemia en un</string>

<string name="changelog">Qué hay de nuevo</string>
<string name="changelog_desc">El orden de las categorías ahora se puede cambiar a través de la configuración.</string>
<string name="changelog_desc">La insulina ahora se puede dividir en bolos, corrección y basales durante la exportación de PDF.</string>

<string name="meal_factor">Alimento-bolo-factor</string>
<string name="meal_factors">Alimento-bolo-factors</string>
Expand Down Expand Up @@ -344,6 +344,7 @@
<string name="change_now">Cambiar ahora</string>
<string name="help">Ayudar</string>
<string name="category_preference_desc">Activo:\nLa categoría se muestra u oculta\n\nFijó:\nLa categoría se preselecciona automáticamente para nuevas entradas\n\nOrdenar:\nMantenga presionado el símbolo de seis puntos y arrastre hacia arriba o hacia abajo</string>
<string name="insulin_split">Dividir la insulina</string>

<string name="theme">Tema de color</string>
<string name="theme_light">Ligero</string>
Expand Down
3 changes: 2 additions & 1 deletion Diaguard/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
<string name="correction_value_desc">Réduction de la glycémie d\'une</string>

<string name="changelog">Quoi de neuf</string>
<string name="changelog_desc">L\'ordre des catégories peut maintenant être changé via les paramètres.</string>
<string name="changelog_desc">L\'insuline peut maintenant être divisée en bolus, correction et basal lors de l\'export PDF.</string>

<string name="meal_factor">Repas-bol-facteur</string>
<string name="meal_factors">Repas-bol-facteurs</string>
Expand Down Expand Up @@ -342,6 +342,7 @@
<string name="change_now">Changer maintenant</string>
<string name="help">Aider</string>
<string name="category_preference_desc">Active:\nLa catégorie est affichée ou masquée\n\nFixé:\nLa catégorie est automatiquement présélectionnée pour les nouvelles entrées\n\nTrier:\n Maintenez le symbole en six points et faites glisser le curseur vers le haut ou le bas</string>
<string name="insulin_split">Fractionner l\'insuline</string>

<string name="theme">Thème de couleur</string>
<string name="theme_light">Lumière</string>
Expand Down
2 changes: 1 addition & 1 deletion Diaguard/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
<string name="oxygen_saturation">Oxygen saturation</string>

<string name="changelog">What\'s new</string>
<string name="changelog_desc">Categories may be reordered from now on via the app settings.</string>
<string name="changelog_desc">Insulin may now be split into bolus, correction and basal during PDF export.</string>

<string name="meal_factor">Meal-bolus-factor</string>
<string name="meal_factors">Meal-bolus-factors</string>
Expand Down

0 comments on commit 63de293

Please sign in to comment.