From 9c9c1fe5f35152673f3eeb5ebf02725730709bc7 Mon Sep 17 00:00:00 2001
From: Akash-Ramjyothi <akash.ramjyothi@gmail.com>
Date: Tue, 30 Aug 2022 20:08:35 +0530
Subject: [PATCH 1/2] Added Currency Option in Logbook

---
 .../activity_logbook_add_fueling_card.xml     |  9 ++++++++-
 .../res/values/strings_logbook.xml            |  8 ++++++++
 .../logbook/LogbookAddFuelingFragment.java    | 20 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/org.envirocar.app/res/layout/activity_logbook_add_fueling_card.xml b/org.envirocar.app/res/layout/activity_logbook_add_fueling_card.xml
index a471a8dff..1bde2c9b4 100644
--- a/org.envirocar.app/res/layout/activity_logbook_add_fueling_card.xml
+++ b/org.envirocar.app/res/layout/activity_logbook_add_fueling_card.xml
@@ -22,6 +22,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
@@ -233,11 +234,17 @@
                         android:text="@string/logbook_priceperlitre"
                         android:textSize="12sp"/>
 
+                    <Spinner
+                        android:id="@+id/currency_options"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="10dp"/>
+
                     <EditText
                         android:id="@+id/logbook_add_fueling_priceperlitretext"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="@dimen/spacing_large"
+                        android:layout_marginRight="16dp"
                         android:layout_weight="2"
                         android:hint="0.00 €/l"
                         android:inputType="numberDecimal"/>
diff --git a/org.envirocar.app/res/values/strings_logbook.xml b/org.envirocar.app/res/values/strings_logbook.xml
index 937cb9d4e..6716ef612 100644
--- a/org.envirocar.app/res/values/strings_logbook.xml
+++ b/org.envirocar.app/res/values/strings_logbook.xml
@@ -51,4 +51,12 @@
     <string name="logbook_background_no_cars_second">Please create a car before accessing this feature.</string>
     <string name="logbook_background_no_internet_first">NO INTERNET CONNECTION</string>
     <string name="logbook_background_no_internet_second">You are offline,To access the logs you need an active internet connection</string>
+    
+    <string-array name="currency">
+        <item>€</item>
+        <item>$</item>
+        <item>¥</item>
+        <item>£</item>
+    </string-array>
+    
 </resources>
diff --git a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
index 53f096cde..9f482f726 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
@@ -33,11 +33,14 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -131,6 +134,8 @@ public class LogbookAddFuelingFragment extends BaseInjectorFragment {
     protected TextView infoBackgroundFirst;
     @BindView(R.id.layout_general_info_background_secondline)
     protected TextView infoBackgroundSecond;
+    @BindView(R.id.currency_options)
+    protected Spinner currencySpinner;
 
     @Inject
     protected CarPreferenceHandler carHandler;
@@ -149,6 +154,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
         View view = inflater.inflate(R.layout.activity_logbook_add_fueling_card, container, false);
         ButterKnife.bind(this, view);
 
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(),R.array.currency, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        currencySpinner.setAdapter(adapter);
+        currencySpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        });
+
         view.setOnClickListener(v -> hideKeyboard(view));
         contentView.setOnClickListener(v -> hideKeyboard(contentView));
 

From 40cdd233b87f8b8fc008a12aeb4283ee61e3e8f3 Mon Sep 17 00:00:00 2001
From: Akash-Ramjyothi <akash.ramjyothi@gmail.com>
Date: Tue, 30 Aug 2022 23:14:01 +0530
Subject: [PATCH 2/2] Added placeholders

---
 .../app/views/logbook/LogbookAddFuelingFragment.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
index 9f482f726..1429e72aa 100644
--- a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
+++ b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookAddFuelingFragment.java
@@ -161,6 +161,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
             @Override
             public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
 
+                String text = adapterView.getItemAtPosition(i).toString();
+                addFuelingPricePerLitreText.setHint("0.00 "+text+"/l");
+                addFuelingTotalCostText.setHint("0.00 "+text);
+
             }
 
             @Override