New logo

app/src/main/AndroidManifest.xml

@@ -4,9 +4,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/appName"
-        android:theme="@style/AppThemeDark" >
+        android:theme="@style/AppTheme" >
 
         <meta-data android:name="android.max_aspect" android:value="2.1" />
 

app/src/main/java/fr/corenting/convertisseureurofranc/ConverterActivity.java

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -33,7 +34,6 @@ public class ConverterActivity extends AppCompatActivity {
 
     private Spinner originSpinner;
     private Spinner resultSpinner;
-    private Spinner currencySpinner;
     private TextView currencyOriginTextView;
     private TextView currencyResultTextView;
     private Button convertButton;
@@ -45,9 +45,9 @@ public class ConverterActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if (prefs.getBoolean(getString(R.string.preferenceDarkThemeKey), false)) {
-            setTheme(R.style.AppThemeDark);
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
         } else {
-            setTheme(R.style.AppTheme);
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_converter);
@@ -56,11 +56,11 @@ protected void onCreate(Bundle savedInstanceState) {
         converter = new France(this);
 
         // Binding
-        originSpinner = (Spinner) findViewById(R.id.yearOfOriginSpinner);
-        resultSpinner = (Spinner) findViewById(R.id.yearOfResultSpinner);
-        currencySpinner = (Spinner) findViewById(R.id.currencySpinner);
-        currencyOriginTextView = (TextView) findViewById(R.id.currencyOriginTextView);
-        currencyResultTextView = (TextView) findViewById(R.id.currencyResultTextView);
+        originSpinner = findViewById(R.id.yearOfOriginSpinner);
+        resultSpinner = findViewById(R.id.yearOfResultSpinner);
+        Spinner currencySpinner = findViewById(R.id.currencySpinner);
+        currencyOriginTextView = findViewById(R.id.currencyOriginTextView);
+        currencyResultTextView = findViewById(R.id.currencyResultTextView);
 
         //Initialize the years spinners and the buttons
         initSpinners();
@@ -104,13 +104,13 @@ private void initSpinners() {
 
     private void initButtons() {
         //Convert when the button is clicked
-        convertButton = (Button) findViewById(R.id.convertButton);
+        convertButton = findViewById(R.id.convertButton);
         convertButton.setImeActionLabel(getString(R.string.convertButton), KeyEvent.KEYCODE_ENTER);
-        resultEditText = (EditText) findViewById(R.id.resultEditText);
+        resultEditText = findViewById(R.id.resultEditText);
         resultEditText.setKeyListener(null); //Make the EditText widget read only
 
         //Click button when using enter on the keyboard
-        amountEditText = (EditText) findViewById(R.id.amountEditText);
+        amountEditText = findViewById(R.id.amountEditText);
         amountEditText.setOnKeyListener(new View.OnKeyListener() {
 
             @Override

app/src/main/java/fr/corenting/convertisseureurofranc/utils/Utils.java

@@ -26,7 +26,7 @@ public static void hideSoftKeyboard(View v) {
     public static void showCredits(Activity activity) {
         ((TextView) new AlertDialog.Builder(activity)
                 .setTitle(R.string.appName)
-                .setIcon(R.drawable.ic_launcher)
+                .setIcon(R.mipmap.ic_launcher)
                 .setMessage(Html.fromHtml(activity.getString(R.string.aboutText) + BuildConfig.VERSION_NAME))
                 .setNegativeButton("OK", new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#3F51B5</color>
+</resources>

app/src/main/res/values/styles.xml

@@ -1,12 +1,6 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="AppThemeDark" parent="Theme.AppCompat">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>