diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
index f1902a211..49fe9bf13 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
@@ -3,21 +3,19 @@ package fr.free.nrw.commons.settings;
import android.os.Bundle;
import android.view.MenuItem;
+import android.view.View;
import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.databinding.ActivitySettingsBinding;
import fr.free.nrw.commons.theme.BaseActivity;
/**
* allows the user to change the settings
*/
public class SettingsActivity extends BaseActivity {
+
+ private ActivitySettingsBinding binding;
private AppCompatDelegate settingsDelegate;
- @BindView(R.id.toolbar)
- Toolbar toolbar;
/**
* to be called when the activity starts
* @param savedInstanceState the previously saved state
@@ -25,10 +23,11 @@ public class SettingsActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_settings);
+ binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+ final View view = binding.getRoot();
+ setContentView(view);
- ButterKnife.bind(this);
- setSupportActionBar(toolbar);
+ setSupportActionBar(binding.toolbarBinding.toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 494a6cc4d..70db3d5f3 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -11,7 +11,9 @@
android:id="@+id/toolbarLayout"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize">
-
+