Skip to content

Commit e982d7f

Browse files
committed
Refactor: move Utils and use BaseActivity
- Move `Utils` import to the `utils` package in `AboutActivity`. - Extend `BaseActivity` instead of `AppCompatActivity` in `AboutActivity` and `MainActivity`. - Update the title in `AboutActivity` to use the string resource `R.string.about`.
1 parent e6b6b35 commit e982d7f

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

app/src/main/java/com/ahmadabuhasan/qrbarcode/AboutActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package com.ahmadabuhasan.qrbarcode;
22

3-
import static com.ahmadabuhasan.qrbarcode.Utils.interstitialAd;
3+
import static com.ahmadabuhasan.qrbarcode.utils.Utils.interstitialAd;
44

55
import android.os.Bundle;
66
import android.view.MenuItem;
77

88
import androidx.annotation.NonNull;
9-
import androidx.appcompat.app.AppCompatActivity;
109

1110
import com.ahmadabuhasan.qrbarcode.databinding.ActivityAboutBinding;
11+
import com.ahmadabuhasan.qrbarcode.utils.BaseActivity;
12+
import com.ahmadabuhasan.qrbarcode.utils.Utils;
1213
import com.google.android.gms.ads.AdRequest;
1314
import com.google.android.gms.ads.MobileAds;
1415

1516
import java.util.Objects;
1617

17-
public class AboutActivity extends AppCompatActivity {
18+
public class AboutActivity extends BaseActivity {
1819

1920
private ActivityAboutBinding binding;
2021

@@ -26,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
2627

2728
Objects.requireNonNull(getSupportActionBar()).setHomeButtonEnabled(true);
2829
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
29-
getSupportActionBar().setTitle("About QRBarcode");
30+
getSupportActionBar().setTitle(getString(R.string.about));
3031

3132
binding.version.setText(String.format("%s%s", getResources().getString(R.string.version), BuildConfig.VERSION_NAME));
3233

app/src/main/java/com/ahmadabuhasan/qrbarcode/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import android.widget.Toast;
1515

1616
import androidx.annotation.NonNull;
17-
import androidx.appcompat.app.AppCompatActivity;
1817
import androidx.core.content.ContextCompat;
1918

2019
import com.ahmadabuhasan.qrbarcode.databinding.ActivityMainBinding;
20+
import com.ahmadabuhasan.qrbarcode.utils.BaseActivity;
2121
import com.google.android.gms.ads.AdRequest;
2222
import com.google.android.gms.ads.MobileAds;
2323
import com.google.android.gms.tasks.Task;
@@ -38,7 +38,7 @@
3838
* "com.android.tools.build:gradle:4.1.1"
3939
*/
4040

41-
public class MainActivity extends AppCompatActivity implements ZXingScannerView.ResultHandler {
41+
public class MainActivity extends BaseActivity implements ZXingScannerView.ResultHandler {
4242

4343
private static final int PERMISSION_CODE = 100;
4444
private static final int FLEXIBLE_APP_UPDATE_REQ_CODE = 123;

0 commit comments

Comments
 (0)