Паттерн

[+] Продолжаю переписывать на MVP.
plumsoftware · Sep 10, 2024 · 512d95e · 512d95e
1 parent b6bac17
commit 512d95e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 31 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "ru.plumsoftware.notebook"
         minSdk 22
         targetSdk 34
-        versionCode 28
-        versionName "2.0.5"
+        versionCode 29
+        versionName "2.0.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...va/ru/plumsoftware/notebook/presentation/activities/main/presenter/MainPresenterImpl.java b/...va/ru/plumsoftware/notebook/presentation/activities/main/presenter/MainPresenterImpl.java
@@ -58,6 +58,7 @@ public MainPresenterImpl(Context context, @NonNull Activity activity, MainView m
         this.activity = activity;
         this.mainView = mainView;
         filteredNotes = new ArrayList<>();
+        notes = new ArrayList<>();
     }
 
     @Override
@@ -89,6 +90,7 @@ public void initMobileSdk() {
 
     @Override
     public void initNotes(Conditions conditions) {
+        mainView.showProgressDialog();
         if (conditions instanceof Conditions.Search) {
             filteredNotes.clear();
             String query = ((Conditions.Search) conditions).getQuery();
@@ -110,12 +112,10 @@ public void initNotes(Conditions conditions) {
 
             mainView.initRecyclerView(filteredNotes, layoutManager);
         } else if (conditions instanceof Conditions.All) {
-            mainView.showProgressDialog();
-            if (notes == null) {
-                SQLiteDatabaseManager sqLiteDatabaseManager = new SQLiteDatabaseManager(context);
-                sqLiteDatabaseNotes = sqLiteDatabaseManager.getWritableDatabase();
-                notes = loadNotes();
-            }
+            notes.clear();
+            SQLiteDatabaseManager sqLiteDatabaseManager = new SQLiteDatabaseManager(context);
+            sqLiteDatabaseNotes = sqLiteDatabaseManager.getWritableDatabase();
+            notes = loadNotes();
 
             isList = true;
             mainView.changeFilterButtonImage(R.drawable.ic_baseline_filter_list);
@@ -161,8 +161,8 @@ public void onAdImpression(@Nullable final ImpressionData impressionData) {
             public void onAdLoaded(@NonNull final AppOpenAd appOpenAd) {
                 mainAppOpenAd = appOpenAd;
                 appOpenAd.setAdEventListener(appOpenAdEventListener);
-                mainAppOpenAd.show(activity);
                 mainView.dismissProgressDialog();
+                mainAppOpenAd.show(activity);
             }
 
             @Override
@@ -173,6 +173,7 @@ public void onAdFailedToLoad(@NonNull final AdRequestError adRequestError) {
 
         appOpenAdLoader.setAdLoadListener(appOpenAdLoadListener);
         appOpenAdLoader.loadAd(adRequestConfiguration);
+        mainView.dismissProgressDialog();
     }
 
     @NonNull

diff --git a/...rc/main/java/ru/plumsoftware/notebook/presentation/activities/main/view/MainActivity.java b/...rc/main/java/ru/plumsoftware/notebook/presentation/activities/main/view/MainActivity.java
@@ -51,9 +51,6 @@ protected void onCreate(Bundle savedInstanceState) {
         ImageButton addNote = findViewById(R.id.addNote);
         progressDialog = new ProgressDialog(context, R.style.CustomProgressDialog);
 
-        presenter.initMobileSdk();
-        presenter.initNotes(new Conditions.All());
-
 //        load ad
         presenter.initOpenAds();
 
@@ -107,4 +104,12 @@ public void showProgressDialog() {
     public void dismissProgressDialog() {
         progressDialog.dismiss();
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        presenter.initNotes(new Conditions.All());
+        presenter.initMobileSdk();
+    }
 }
diff --git a/...ru/plumsoftware/notebook/presentation/activities/note/presenter/AddNotePresenterImpl.java b/...ru/plumsoftware/notebook/presentation/activities/note/presenter/AddNotePresenterImpl.java
@@ -54,6 +54,11 @@ public void initNote() {
         SQLiteDatabaseManager sqLiteDatabaseManager = new SQLiteDatabaseManager(addNoteModel.getContext());
         sqLiteDatabaseNotes = sqLiteDatabaseManager.getWritableDatabase();
 
+        addNoteModel.setNote(addNoteModel.getActivity().getIntent().getParcelableExtra(ExtraNames.AddNoteActivity.note));
+        if (addNoteModel.getNote() != null) {
+            view.initNote(addNoteModel.getNote());
+        }
+
         String title;
         String textOnButton;
         String time;
@@ -70,11 +75,6 @@ public void initNote() {
             time = new SimpleDateFormat("dd.MM.yyyy HH:mm", Locale.getDefault()).format(new Date(System.currentTimeMillis()));
         }
         view.initToolbarTitle(title, textOnButton, time);
-
-        addNoteModel.setNote(addNoteModel.getActivity().getIntent().getParcelableExtra(ExtraNames.AddNoteActivity.note));
-        if (addNoteModel.getNote() != null) {
-            view.initNote(addNoteModel.getNote());
-        }
     }
 
     @Override

diff --git a/...main/java/ru/plumsoftware/notebook/presentation/activities/note/view/AddNoteActivity.java b/...main/java/ru/plumsoftware/notebook/presentation/activities/note/view/AddNoteActivity.java
@@ -28,18 +28,9 @@
 import android.widget.GridView;
 import android.widget.TextView;
 import android.widget.TimePicker;
-import android.widget.Toast;
 
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.snackbar.Snackbar;
-import com.yandex.mobile.ads.common.AdError;
-import com.yandex.mobile.ads.common.AdRequestConfiguration;
-import com.yandex.mobile.ads.common.AdRequestError;
-import com.yandex.mobile.ads.common.ImpressionData;
-import com.yandex.mobile.ads.interstitial.InterstitialAd;
-import com.yandex.mobile.ads.interstitial.InterstitialAdEventListener;
-import com.yandex.mobile.ads.interstitial.InterstitialAdLoadListener;
-import com.yandex.mobile.ads.interstitial.InterstitialAdLoader;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -51,7 +42,6 @@
 import ru.plumsoftware.data.model.ui.Colors;
 import ru.plumsoftware.data.model.ui.Note;
 import ru.plumsoftware.data.model.ui.Shape;
-import ru.plumsoftware.notebook.manager.ads.AdsIds;
 import ru.plumsoftware.notebook.presentation.activities.note.presenter.AddNotePresenter;
 import ru.plumsoftware.notebook.presentation.activities.note.presenter.AddNotePresenterImpl;
 import ru.plumsoftware.notebook.presentation.dialogs.ProgressDialog;
@@ -70,18 +60,17 @@ public class AddNoteActivity extends AppCompatActivity implements AddNoteView {
             color,
             opacityRes = R.drawable.ic_coffee;
 
-    private ProgressDialog progressDialog;
-
     private Calendar dateAndTime = Calendar.getInstance();
 
-    private long noteTime = 0L;
+    private long noteTime = System.currentTimeMillis();
 
     private Toolbar toolbar;
     private CardView cardViewBtnDone;
     private CheckBox checkBox;
     private TextView textViewOnButton;
     private EditText tvTitle;
     private EditText tvText;
+    private ProgressDialog progressDialog;
 
     private AddNotePresenter presenter;
 

diff --git a/app/src/main/java/ru/plumsoftware/notebook/presentation/adapters/NoteAdapter.java b/app/src/main/java/ru/plumsoftware/notebook/presentation/adapters/NoteAdapter.java
@@ -230,7 +230,6 @@ public void onClick(View view) {
                 intent.putExtra("isLoadAppOpenAd", false);
                 activity.startActivity(intent);
                 activity.overridePendingTransition(0, 0);
-                activity.finish();
 
 //                BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(context, R.style.BottomSheetTheme);
 //                bottomSheetDialog.setContentView(R.layout.add_note_layout);