add estimate for diffuse efficiency

update strings
update fastlane image
This commit is contained in:
woheller69 2023-04-01 16:17:56 +02:00
parent a2793604f5
commit 0ab3efd819
5 changed files with 17 additions and 3 deletions

View file

@ -9,6 +9,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.ItemTouchHelper;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
@ -101,6 +103,18 @@ public class ManageLocationsActivity extends NavigationActivity {
editDiffuseEfficiency.setText(Float.toString(adapter.getCitytoWatch(position).getDiffuseEfficiency())); editDiffuseEfficiency.setText(Float.toString(adapter.getCitytoWatch(position).getDiffuseEfficiency()));
editConverterPowerLimit.setText(Float.toString(adapter.getCitytoWatch(position).getConverterPowerLimit())); editConverterPowerLimit.setText(Float.toString(adapter.getCitytoWatch(position).getConverterPowerLimit()));
editConverterEfficiency.setText(Float.toString(adapter.getCitytoWatch(position).getConverterEfficiency())); editConverterEfficiency.setText(Float.toString(adapter.getCitytoWatch(position).getConverterEfficiency()));
editElevation.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
@Override
public void afterTextChanged(Editable editable) {
float elevation = Float.parseFloat(editElevation.getText().toString());
editDiffuseEfficiency.setText(Float.toString(100-50 * elevation/90));
}
});
alert.setPositiveButton(getString(R.string.dialog_edit_change_button), (dialog, whichButton) -> { alert.setPositiveButton(getString(R.string.dialog_edit_change_button), (dialog, whichButton) -> {
adapter.updateCity(position, String.valueOf(editCity.getText()), adapter.updateCity(position, String.valueOf(editCity.getText()),

View file

@ -70,7 +70,7 @@ public class RecyclerOverviewListAdapter extends RecyclerView.Adapter<ItemViewHo
holder.cellsArea.setText(context.getString(R.string.edit_location_hint_cells_area) +": "+ cities.get(position).getCellsArea()); holder.cellsArea.setText(context.getString(R.string.edit_location_hint_cells_area) +": "+ cities.get(position).getCellsArea());
holder.diffuseEfficiency.setText(context.getString(R.string.edit_location_hint_diffuse_efficiency) +": "+ cities.get(position).getDiffuseEfficiency()); holder.diffuseEfficiency.setText(context.getString(R.string.edit_location_hint_diffuse_efficiency) +": "+ cities.get(position).getDiffuseEfficiency());
holder.converterPowerLimit.setText(context.getString(R.string.edit_location_hint_converter_power_limit) +": "+ cities.get(position).getConverterPowerLimit()); holder.converterPowerLimit.setText(context.getString(R.string.edit_location_hint_converter_power_limit) +": "+ cities.get(position).getConverterPowerLimit());
holder.converterEfficiency.setText(context.getString(R.string.edit_location_hint_cells_efficiency) +": "+ cities.get(position).getConverterEfficiency()); holder.converterEfficiency.setText(context.getString(R.string.edit_location_hint_converter_efficiency) +": "+ cities.get(position).getConverterEfficiency());
} }

View file

@ -123,7 +123,7 @@
<string name="edit_location_hint_cells_max_power">Maximalleistung Zelle [W]</string> <string name="edit_location_hint_cells_max_power">Maximalleistung Zelle [W]</string>
<string name="edit_location_hint_cells_efficiency">Wirkungsgrad Zelle [%]</string> <string name="edit_location_hint_cells_efficiency">Wirkungsgrad Zelle [%]</string>
<string name="edit_location_hint_cells_area">Fläche Zelle [m\u00b2]</string> <string name="edit_location_hint_cells_area">Fläche Zelle [m\u00b2]</string>
<string name="edit_location_hint_diffuse_efficiency">Effizenz diffus [%]</string> <string name="edit_location_hint_diffuse_efficiency">Effizenz diffuse Strahlung [%]</string>
<string name="edit_location_hint_converter_power_limit">Leistung Wechselrichter [W]</string> <string name="edit_location_hint_converter_power_limit">Leistung Wechselrichter [W]</string>
<string name="edit_location_hint_converter_efficiency">Effizienz Wechselrichter [%]</string> <string name="edit_location_hint_converter_efficiency">Effizienz Wechselrichter [%]</string>
<string name="units_Wh">Wh</string> <string name="units_Wh">Wh</string>

View file

@ -125,7 +125,7 @@
<string name="edit_location_hint_cells_max_power">Cells max power [W]</string> <string name="edit_location_hint_cells_max_power">Cells max power [W]</string>
<string name="edit_location_hint_cells_efficiency">Cells efficiency [%]</string> <string name="edit_location_hint_cells_efficiency">Cells efficiency [%]</string>
<string name="edit_location_hint_cells_area">Cell area [m\u00b2]</string> <string name="edit_location_hint_cells_area">Cell area [m\u00b2]</string>
<string name="edit_location_hint_diffuse_efficiency">Diffuse efficiency [%]</string> <string name="edit_location_hint_diffuse_efficiency">Diffuse radiation efficiency [%]</string>
<string name="edit_location_hint_converter_power_limit">Converter power [W]</string> <string name="edit_location_hint_converter_power_limit">Converter power [W]</string>
<string name="edit_location_hint_converter_efficiency">Converter efficiency [%]</string> <string name="edit_location_hint_converter_efficiency">Converter efficiency [%]</string>
<string name="units_Wh">Wh</string> <string name="units_Wh">Wh</string>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Before After
Before After