add support for different languages.

android_app/app/src/main/java/com/health/openscale/gui/GraphFragment.java

@@ -103,8 +103,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
 	    
 	    axisY.setHasLines(true);
 	    
-	    axisX.setName("Zeit");
+	    axisX.setName(getResources().getString(R.string.label_x_axis));
-	    axisY.setName("Wert");
+	    axisY.setName(getResources().getString(R.string.label_y_axis));
 	    
 	    axisX.setTextColor(Color.BLACK);
 	    axisY.setTextColor(Color.BLACK);

android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java

@@ -63,7 +63,6 @@ public class MainActivity extends ActionBarActivity implements
 
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 	    if(prefs.getBoolean("btEnable", true)) {
-	    	Log.i("ASD", "BT TRZE");
 	    	String deviceName = prefs.getString("btDeviceName", "openScale");
 	    	OpenScale.getInstance(getApplicationContext()).startBluetoothServer(deviceName);
 	    }
@@ -74,8 +73,7 @@ public class MainActivity extends ActionBarActivity implements
 
 		// Create the adapter that will return a fragment for each of the three
 		// primary sections of the activity.
-		mSectionsPagerAdapter = new SectionsPagerAdapter(
+		mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
-				getSupportFragmentManager(), this);
 
 		// Set up the ViewPager with the sections adapter.
 		mViewPager = (ViewPager) findViewById(R.id.pager);
@@ -157,7 +155,7 @@ public class MainActivity extends ActionBarActivity implements
 		private GraphFragment graphFrag;
 		private TableFragment tableFrag;
 		
-		public SectionsPagerAdapter(FragmentManager fm, Context con) {
+		public SectionsPagerAdapter(FragmentManager fm) {
 			super(fm);
 			
 			overviewFrag = new OverviewFragment();

android_app/app/src/main/java/com/health/openscale/gui/NewEntryActivity.java

@@ -101,42 +101,42 @@ public class NewEntryActivity extends Activity {
 		
 		if( txtWeight.getText().toString().length() == 0 )
 		{
-			txtWeight.setError("Weight value ist required!");
+			txtWeight.setError(getResources().getString(R.string.error_weight_value_required));
 			validate = false;
 		} else if( !(Float.valueOf(txtWeight.getText().toString()) >= 0 && Float.valueOf(txtWeight.getText().toString()) <= 300) )
 		{
-			txtWeight.setError("Value must be in range from 0 to 300!");
+			txtWeight.setError(getResources().getString(R.string.error_value_range_0_300));
 			validate = false;
 		}
 		
 		if( txtFat.getText().toString().length() == 0 )
 		{
-			txtFat.setError("Fat value ist required!");
+			txtFat.setError(getResources().getString(R.string.error_fat_value_required));
 			validate = false;
 		} else if(!isInRange(txtFat.getText().toString()))
 		{
-			txtFat.setError("Value must be in range from 0 to 100");
+			txtFat.setError(getResources().getString(R.string.error_value_range_0_100));
 			validate = false;
 		}
 		
 		
 		if( txtWater.getText().toString().length() == 0 )
 		{
-			txtWater.setError("Water value ist required!");
+			txtWater.setError(getResources().getString(R.string.error_water_value_required));
 			validate = false;
 		} else if(!isInRange(txtWater.getText().toString()))
 		{
-			txtWater.setError("Value must be in range from 0 to 100");
+			txtWater.setError(getResources().getString(R.string.error_value_range_0_100));
 			validate = false;
 		}
 		
 		if( txtMuscle.getText().toString().length() == 0 )
 		{
-			txtMuscle.setError("Muscle value ist required!");
+			txtMuscle.setError(getResources().getString(R.string.error_muscle_value_required));
 			validate = false;
 		} else 	if(!isInRange(txtMuscle.getText().toString()))
 		{
-			txtMuscle.setError("Value must be in range from 0 to 100");
+			txtMuscle.setError(getResources().getString(R.string.error_value_range_0_100));
 			validate = false;
 		}
 		

android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java

@@ -77,14 +77,14 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
 		
 		ScaleData lastEntry = scaleDBEntries.get(0);
 		
-		arcValues.add(new ArcValue((float) lastEntry.fat, Utils.COLOR_ORANGE));
+		arcValues.add(new ArcValue(lastEntry.fat, Utils.COLOR_ORANGE));
-		arcValues.add(new ArcValue((float) lastEntry.water, Utils.COLOR_BLUE));
+		arcValues.add(new ArcValue(lastEntry.water, Utils.COLOR_BLUE));
-		arcValues.add(new ArcValue((float) lastEntry.muscle, Utils.COLOR_GREEN));
+		arcValues.add(new ArcValue(lastEntry.muscle, Utils.COLOR_GREEN));
 		
 		PieChartData pieChartData = new PieChartData(arcValues);
 		pieChartData.setHasLabels(true);
 		pieChartData.setHasCenterCircle(true);
-		pieChartData.setCenterText1(Float.toString(lastEntry.weight) + " kg");
+		pieChartData.setCenterText1(Float.toString(lastEntry.weight) + " " + getResources().getString(R.string.weight_unit));
 		pieChartData.setCenterText1FontSize(35);
 		pieChartData.setCenterText2(new SimpleDateFormat("dd. MMM yyyy (EE)").format(lastEntry.date_time));
 		pieChartData.setCenterText2FontSize(15);
@@ -109,7 +109,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
 		avgWater = avgWater / scaleDBEntries.size();
 		avgMuscle = avgMuscle / scaleDBEntries.size();
 		
-		txtAvgWeight.setText(String.format( "%.1f kg", avgWeight));
+		txtAvgWeight.setText(String.format( "%.1f " + getResources().getString(R.string.weight_unit), avgWeight));
 		txtAvgFat.setText(String.format( "%.1f %%", avgFat));
 		txtAvgWater.setText(String.format( "%.1f %%", avgWater));
 		txtAvgMuscle.setText(String.format( "%.1f %%", avgMuscle));

android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java

@@ -125,32 +125,32 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
 	{
     	AlertDialog.Builder filenameDialog = new AlertDialog.Builder(getActivity());
 
-    	filenameDialog.setTitle("Set filename on /sdcard ...");
+    	filenameDialog.setTitle(getResources().getString(R.string.info_set_filename) + " /sdcard ...");
 
     	final EditText txtFilename = new EditText(tableView.getContext());
     	txtFilename.setText("/openScale_data.csv");
     	
     	filenameDialog.setView(txtFilename);
 
-    	filenameDialog.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+    	filenameDialog.setPositiveButton(getResources().getString(R.string.label_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
             	boolean isError = false;
             	
             	try {
 					OpenScale.getInstance(tableView.getContext()).importData(Environment.getExternalStorageDirectory().getPath() + txtFilename.getText().toString());
 				} catch (IOException e) {
-					Toast.makeText(tableView.getContext(), "Error importing " + e.getMessage(), Toast.LENGTH_SHORT).show();
+					Toast.makeText(tableView.getContext(), getResources().getString(R.string.error_importing) + " " + e.getMessage(), Toast.LENGTH_SHORT).show();
 					isError = true;
 				}
             	
             	if (!isError) {
-            		Toast.makeText(tableView.getContext(), "Data imported from /sdcard" + txtFilename.getText().toString(), Toast.LENGTH_SHORT).show();
+            		Toast.makeText(tableView.getContext(), getResources().getString(R.string.info_data_imported) + " /sdcard" + txtFilename.getText().toString(), Toast.LENGTH_SHORT).show();
             		updateOnView(OpenScale.getInstance(tableView.getContext()).getScaleDBEntries());
             	}
             }
         });
     	
-    	filenameDialog.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+    	filenameDialog.setNegativeButton(getResources().getString(R.string.label_cancel), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
             	dialog.dismiss();
             }
@@ -164,31 +164,31 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
 	{
     	AlertDialog.Builder filenameDialog = new AlertDialog.Builder(getActivity());
 
-    	filenameDialog.setTitle("Set filename on /sdcard ...");
+    	filenameDialog.setTitle(getResources().getString(R.string.info_set_filename) + " /sdcard ...");
 
     	final EditText txtFilename = new EditText(tableView.getContext());
     	txtFilename.setText("/openScale_data.csv");
     	
     	filenameDialog.setView(txtFilename);
 
-    	filenameDialog.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+    	filenameDialog.setPositiveButton(getResources().getString(R.string.label_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
             	boolean isError = false;
             	
             	try {
 					OpenScale.getInstance(tableView.getContext()).exportData(Environment.getExternalStorageDirectory().getPath() + txtFilename.getText().toString());
 				} catch (IOException e) {
-					Toast.makeText(tableView.getContext(), "Error exporting " + e.getMessage(), Toast.LENGTH_SHORT).show();
+					Toast.makeText(tableView.getContext(), getResources().getString(R.string.error_exporting) + " " + e.getMessage(), Toast.LENGTH_SHORT).show();
 					isError = true;
 				} 
             	
             	if (!isError) {
-            		Toast.makeText(tableView.getContext(), "Data exported to /sdcard" + txtFilename.getText().toString(), Toast.LENGTH_SHORT).show();
+            		Toast.makeText(tableView.getContext(), getResources().getString(R.string.info_data_exported) + " /sdcard" + txtFilename.getText().toString(), Toast.LENGTH_SHORT).show();
             	}
             }
         });
     	
-    	filenameDialog.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+    	filenameDialog.setNegativeButton(getResources().getString(R.string.label_cancel), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
             	dialog.dismiss();
             }
@@ -202,18 +202,18 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
 	{
     	AlertDialog.Builder deleteAllDialog = new AlertDialog.Builder(getActivity());
     	
-    	deleteAllDialog.setMessage("Do you really want to delete all database entries?");
+    	deleteAllDialog.setMessage(getResources().getString(R.string.question_really_delete_all));
     	
-    	deleteAllDialog.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+    	deleteAllDialog.setPositiveButton(getResources().getString(R.string.label_yes), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
             	OpenScale.getInstance(tableView.getContext()).deleteAllDBEntries();
             	
-            	Toast.makeText(tableView.getContext(), "All database entries deleted!", Toast.LENGTH_SHORT).show();
+            	Toast.makeText(tableView.getContext(), getResources().getString(R.string.info_data_deleted), Toast.LENGTH_SHORT).show();
         		updateOnView(OpenScale.getInstance(tableView.getContext()).getScaleDBEntries());
             }
         });
     	
-    	deleteAllDialog.setNegativeButton("No", new DialogInterface.OnClickListener() {
+    	deleteAllDialog.setNegativeButton(getResources().getString(R.string.label_no), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
             	dialog.dismiss();
             }

android_app/app/src/main/res/layout/activity_newentry.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.health.openscale"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -21,14 +20,14 @@
                     android:id="@+id/textView1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Weight" />
+                    android:text="@string/label_weight" />
 
                 <EditText
                     android:id="@+id/txtWeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ems="10"
-                    android:hint="Enter value in kg"
+                    android:hint="@string/info_enter_value_unit"
                     android:inputType="numberDecimal" >
 
                     <requestFocus />
@@ -45,14 +44,14 @@
                     android:id="@+id/txtAvgWeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Fat" />
+                    android:text="@string/label_fat" />
 
                 <EditText
                     android:id="@+id/txtFat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ems="10"
-                    android:hint="Enter value in %"
+                    android:hint="@string/info_enter_value_percent"
                     android:inputType="numberDecimal" />
 
             </TableRow>
@@ -66,14 +65,14 @@
                     android:id="@+id/textView3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Water" />
+                    android:text="@string/label_water" />
 
                 <EditText
                     android:id="@+id/txtWater"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ems="10"
-                    android:hint="Enter value in %"
+                    android:hint="@string/info_enter_value_percent"
                     android:inputType="numberDecimal" />
 
             </TableRow>
@@ -87,14 +86,14 @@
                     android:id="@+id/txtAvgFat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Muscle" />
+                    android:text="@string/label_muscle" />
 
                 <EditText
                     android:id="@+id/txtMuscle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ems="10"
-                    android:hint="Enter value in %"
+                    android:hint="@string/info_enter_value_percent"
                     android:inputType="numberDecimal" />
 
             </TableRow>
@@ -108,7 +107,7 @@
                     android:id="@+id/textView5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Date" />
+                    android:text="@string/label_date" />
 
                 <EditText
                     android:id="@+id/txtDate"
@@ -123,7 +122,7 @@
                     android:id="@+id/btnDateSet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Set"
+                    android:text="@string/label_set"
                     android:textSize="15sp" />
 
             </TableRow>
@@ -137,7 +136,7 @@
                     android:id="@+id/txtAvgWater"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Time" />
+                    android:text="@string/label_time" />
 
                 <EditText
                     android:id="@+id/txtTime"
@@ -152,7 +151,7 @@
                     android:id="@+id/btnTimeSet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Set"
+                    android:text="@string/label_set"
                     android:textSize="15sp" />
 
             </TableRow>
@@ -169,7 +168,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="5"
                 android:background="@drawable/flat_selector"
-                android:text="Add" />
+                android:text="@string/label_add" />
 
             <Space
                 android:layout_width="wrap_content"
@@ -182,7 +181,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="5"
                 android:background="@drawable/flat_selector"
-                android:text="Cancel" />
+                android:text="@string/label_cancel" />
         </LinearLayout>
 
     </LinearLayout>

android_app/app/src/main/res/layout/fragment_overview.xml

@@ -37,7 +37,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="3"
-                            android:text="Weight Ø"
+                            android:text="@string/label_weight_average"
                             android:textStyle="bold" />
 
                         <TextView
@@ -51,7 +51,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="3"
-                            android:text="Fat Ø"
+                            android:text="@string/label_fat_average"
                             android:textStyle="bold" />
 
                         <TextView
@@ -73,7 +73,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="3"
-                            android:text="Water Ø"
+                            android:text="@string/label_water_average"
                             android:textStyle="bold" />
 
                         <TextView
@@ -87,7 +87,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="3"
-                            android:text="Muscle Ø"
+                            android:text="@string/label_muscle"
                             android:textStyle="bold" />
 
                         <TextView

android_app/app/src/main/res/layout/fragment_table.xml

@@ -27,37 +27,37 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Date"
+                    android:text="@string/label_date"
                     android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Time"
+                    android:text="@string/label_time"
                     android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Weight"
+                    android:text="@string/label_weight"
                     android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Fat"
+                    android:text="@string/label_fat"
                     android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Water"
+                    android:text="@string/label_water"
                     android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Muscle"
+                    android:text="@string/label_muscle"
                     android:textStyle="bold" />
 
                 <Button
@@ -68,7 +68,7 @@
                     android:background="@drawable/flat_selector"
                     android:minHeight="0dp"
                     android:minWidth="0dp"
-                    android:text="Delete All"
+                    android:text="@string/label_delete_all"
                     android:textColor="@android:color/white"
                     android:textSize="10sp" />
 
@@ -89,7 +89,7 @@
            android:layout_height="wrap_content"
            android:layout_weight="5"
            android:background="@drawable/flat_selector"
-           android:text="Import"
+           android:text="@string/label_import"
            android:textColor="@android:color/white" />
 
        <Space
@@ -103,7 +103,7 @@
            android:layout_height="wrap_content"
            android:layout_weight="5"
            android:background="@drawable/flat_selector"
-           android:text="Export"
+           android:text="@string/label_export"
            android:textColor="@android:color/white" />
 
    </LinearLayout>

android_app/app/src/main/res/values/strings.xml

@@ -6,5 +6,54 @@
     <string name="title_graph">graph</string>
     <string name="title_frag">table</string>
     <string name="action_settings">Settings</string>
+    <string name="label_add">Add</string>
+    <string name="label_cancel">Cancel</string>
+    <string name="label_ok">Ok</string>
+    <string name="label_yes">Yes</string>
+    <string name="label_no">No</string>
 
+    <string name="label_weight">Weight</string>
+    <string name="label_fat">Fat</string>
+    <string name="label_water">Water</string>
+    <string name="label_muscle">Muscle</string>
+
+    <string name="weight_unit">kg</string>
+
+    <string name="label_date">Date</string>
+    <string name="label_time">Time</string>
+    <string name="label_set">Set</string>
+
+    <string name="label_weight_average">Weight Ø</string>
+    <string name="label_fat_average">Fat Ø</string>
+    <string name="label_water_average">Water Ø</string>
+    <string name="label_muscle_average">Muscle Ø</string>
+
+    <string name="label_import">Import</string>
+    <string name="label_export">Export</string>
+    <string name="label_delete_all">Delete all</string>
+
+    <string name="label_x_axis">Date</string>
+    <string name="label_y_axis">Value</string>
+
+    <string name="error_weight_value_required">Weight value is required!</string>
+    <string name="error_fat_value_required">Fat value is required!</string>
+    <string name="error_water_value_required">Water value is required!</string>
+    <string name="error_muscle_value_required">Muscle value is required!</string>
+    <string name="error_value_range_0_300">Value must be in range from 0 to 300!</string>
+    <string name="error_value_range_0_100">Value must be in range from 0 to 100!</string>
+    <string name="error_exporting">Error exporting</string>
+    <string name="error_importing">Error importing</string>
+
+    <string name="info_data_deleted">All database entries deleted!</string>
+    <string name="info_data_exported">Data exported to</string>
+    <string name="info_data_imported">Data imported from</string>
+    <string name="info_set_filename">Set filename to</string>
+    <string name="info_enter_value_percent">Enter value in %</string>
+    <string name="info_enter_value_unit">Enter value in kg</string>
+
+    <string name="question_really_delete_all">Do you really want to delete all database entries?</string>
+
+    <string name="label_bluetooth_title">Bluetooth</string>
+    <string name="label_bluetooth_enable">Enable Bluetooth Server</string>
+    <string name="label_device_name">Device Name</string>
 </resources>

android_app/app/src/main/res/xml/preferences.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     
-    <PreferenceCategory android:title="Bluetooth"><CheckBoxPreference android:title="Enable Bluetooth Server" android:key="btEnable" android:defaultValue="true"/><EditTextPreference android:key="btDeviceName" android:defaultValue="openScale" android:title="Device Name"/>
+<PreferenceCategory android:title="@string/label_bluetooth_title">
-    
+    <CheckBoxPreference android:title="@string/label_bluetooth_enable" android:key="btEnable" android:defaultValue="true"/>
+    <EditTextPreference android:title="@string/label_device_name" android:key="btDeviceName" android:defaultValue="openScale" />
 </PreferenceCategory>