Skip to content

Commit bd06a74

Browse files
commons-app#4664 Moved Settings Activity to ViewBinding (commons-app#5506)
* Moved Main Activity and Settings Activity to ViewBinding * Moving only SettingsActivity for now * Removed values-yue-hant directory * Removing previously done changes to main.xml
1 parent fec6dba commit bd06a74

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,31 @@
33
import android.os.Bundle;
44
import android.view.MenuItem;
55

6+
import android.view.View;
67
import androidx.appcompat.app.AppCompatDelegate;
78

8-
import androidx.appcompat.widget.Toolbar;
9-
import butterknife.BindView;
10-
import butterknife.ButterKnife;
11-
import fr.free.nrw.commons.R;
9+
import fr.free.nrw.commons.databinding.ActivitySettingsBinding;
1210
import fr.free.nrw.commons.theme.BaseActivity;
1311

1412
/**
1513
* allows the user to change the settings
1614
*/
1715
public class SettingsActivity extends BaseActivity {
16+
17+
private ActivitySettingsBinding binding;
1818
private AppCompatDelegate settingsDelegate;
19-
@BindView(R.id.toolbar)
20-
Toolbar toolbar;
2119
/**
2220
* to be called when the activity starts
2321
* @param savedInstanceState the previously saved state
2422
*/
2523
@Override
2624
protected void onCreate(Bundle savedInstanceState) {
2725
super.onCreate(savedInstanceState);
28-
setContentView(R.layout.activity_settings);
26+
binding = ActivitySettingsBinding.inflate(getLayoutInflater());
27+
final View view = binding.getRoot();
28+
setContentView(view);
2929

30-
ButterKnife.bind(this);
31-
setSupportActionBar(toolbar);
30+
setSupportActionBar(binding.toolbarBinding.toolbar);
3231
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
3332
}
3433

app/src/main/res/layout/activity_settings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
android:id="@+id/toolbarLayout"
1212
android:layout_width="wrap_content"
1313
android:layout_height="?attr/actionBarSize">
14-
<include layout="@layout/toolbar" />
14+
<include
15+
android:id="@+id/toolbarBinding"
16+
layout="@layout/toolbar" />
1517
</LinearLayout>
1618
<RelativeLayout
1719
android:layout_width="match_parent"

0 commit comments

Comments
 (0)