Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/java/ir/ham3da/darya/App.java # build.gradle
ham3da · Jun 3, 2020 · 68d2854 · 68d2854
2 parents ea67043 + a06ee0c
commit 68d2854
Show file tree

Hide file tree

Showing 32 changed files with 4 additions and 82 deletions.
diff --git a/app/src/main/java/ir/ham3da/darya/ActivityCate.java b/app/src/main/java/ir/ham3da/darya/ActivityCate.java
@@ -6,7 +6,6 @@
 
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -24,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import ir.ham3da.darya.adaptors.CateRecycleAdaptor;
 import ir.ham3da.darya.adaptors.CategoryRecycleAdaptor;
 import ir.ham3da.darya.adaptors.PoemsRecycleAdaptor;
 import ir.ham3da.darya.ganjoor.CateWithPoem;

diff --git a/app/src/main/java/ir/ham3da/darya/ActivityCollection.java b/app/src/main/java/ir/ham3da/darya/ActivityCollection.java
@@ -19,7 +19,6 @@
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.webkit.URLUtil;
 import android.widget.SearchView;
 
@@ -220,7 +219,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
             int id = searchView.getContext()
                     .getResources()
                     .getIdentifier("android:id/search_src_text", null, null);
-            TextView textView = (TextView) searchView.findViewById(id);
+            TextView textView = searchView.findViewById(id);
             textView.setTypeface(typeface);
         } catch (Exception ex) {
             Log.e(TAG, "msg: " + ex.getMessage());

diff --git a/app/src/main/java/ir/ham3da/darya/ActivityImageEdit.java b/app/src/main/java/ir/ham3da/darya/ActivityImageEdit.java
@@ -3,13 +3,11 @@
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.ImageDecoder;
 import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -34,7 +32,6 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.core.app.ActivityCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 

diff --git a/app/src/main/java/ir/ham3da/darya/ActivityPoem.java b/app/src/main/java/ir/ham3da/darya/ActivityPoem.java
@@ -3,7 +3,6 @@
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.Color;

diff --git a/app/src/main/java/ir/ham3da/darya/ActivityPuzzle.java b/app/src/main/java/ir/ham3da/darya/ActivityPuzzle.java
@@ -3,15 +3,13 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 
 import android.content.Context;
 import android.media.MediaPlayer;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.text.method.ArrowKeyMovementMethod;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -25,22 +23,15 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.android.material.appbar.CollapsingToolbarLayout;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Random;
 
-import ir.ham3da.darya.ganjoor.GanjoorCat;
 import ir.ham3da.darya.ganjoor.GanjoorDbBrowser;
-import ir.ham3da.darya.ganjoor.GanjoorPoem;
 import ir.ham3da.darya.ganjoor.GanjoorPoet;
 import ir.ham3da.darya.ganjoor.GanjoorVerse;
 import ir.ham3da.darya.utility.AppFontManager;
 import ir.ham3da.darya.utility.AppSettings;
-import ir.ham3da.darya.utility.DownloadFromUrl;
 import ir.ham3da.darya.utility.MyDialogs;
 import ir.ham3da.darya.utility.RateType;
 import ir.ham3da.darya.utility.SetLanguage;

diff --git a/app/src/main/java/ir/ham3da/darya/ActivitySearch.java b/app/src/main/java/ir/ham3da/darya/ActivitySearch.java
@@ -16,7 +16,6 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.speech.RecognizerIntent;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/ir/ham3da/darya/ActivitySettings.java b/app/src/main/java/ir/ham3da/darya/ActivitySettings.java
@@ -12,10 +12,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -30,7 +27,6 @@
 import androidx.preference.SwitchPreference;
 import androidx.preference.SwitchPreferenceCompat;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;

diff --git a/app/src/main/java/ir/ham3da/darya/SearchLimitsDialog.java b/app/src/main/java/ir/ham3da/darya/SearchLimitsDialog.java
@@ -7,22 +7,15 @@
 
 import android.widget.AdapterView;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.RelativeLayout;
 import android.widget.Spinner;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import android.widget.AdapterView.OnItemSelectedListener;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
-import ir.ham3da.darya.adaptors.AdaptorBooks;
 import ir.ham3da.darya.adaptors.PoetSpinnerAdapter;
-import ir.ham3da.darya.ganjoor.GanjoorCat;
 import ir.ham3da.darya.ganjoor.GanjoorDbBrowser;
 import ir.ham3da.darya.ganjoor.GanjoorPoet;
 import ir.ham3da.darya.utility.AppSettings;

diff --git a/app/src/main/java/ir/ham3da/darya/SearchWordAsyncTask.java b/app/src/main/java/ir/ham3da/darya/SearchWordAsyncTask.java
@@ -9,7 +9,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import ir.ham3da.darya.adaptors.SearchCustomAdapter;
 import ir.ham3da.darya.ganjoor.GanjoorDbBrowser;

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/AdapterPoetsExpand.java b/app/src/main/java/ir/ham3da/darya/adaptors/AdapterPoetsExpand.java
@@ -7,7 +7,6 @@
 import androidx.annotation.NonNull;
 
 import android.util.TypedValue;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -114,7 +113,7 @@ public class PoetsViewHolder extends PoetAndBooksAdapter.HeaderViewHolder {
         LinearLayout poets_liner;
 
         private PoetsViewHolder(View view) {
-            super(view, (ImageView) view.findViewById(R.id.item_arrow));
+            super(view, view.findViewById(R.id.item_arrow));
 
 
             poets_name = view.findViewById(R.id.poets_name);

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/AdapterRandomPoem.java b/app/src/main/java/ir/ham3da/darya/adaptors/AdapterRandomPoem.java
@@ -8,8 +8,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -153,7 +151,7 @@ public class PoetsViewHolder extends PoetAndBooksAdapter.HeaderViewHolder {
         LinearLayout poets_liner;
 
         private PoetsViewHolder(View view) {
-            super(view, (ImageView) view.findViewById(R.id.item_arrow));
+            super(view, view.findViewById(R.id.item_arrow));
             poets_name = view.findViewById(R.id.poets_name);
             checkbox_poet = view.findViewById(R.id.checkbox_poet);
             poets_liner = view.findViewById(R.id.poets_liner);

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/AdapterSocialList.java b/app/src/main/java/ir/ham3da/darya/adaptors/AdapterSocialList.java
@@ -2,19 +2,15 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import androidx.core.widget.ImageViewCompat;
 
 import java.util.ArrayList;
 

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/CategoryRecycleAdaptor.java b/app/src/main/java/ir/ham3da/darya/adaptors/CategoryRecycleAdaptor.java
@@ -21,7 +21,6 @@
 import ir.ham3da.darya.Bungee;
 import ir.ham3da.darya.R;
 import ir.ham3da.darya.ganjoor.CateWithPoem;
-import ir.ham3da.darya.ganjoor.GanjoorCat;
 import ir.ham3da.darya.utility.AppFontManager;
 import ir.ham3da.darya.utility.AppSettings;
 

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/ExpandableAdapter.java b/app/src/main/java/ir/ham3da/darya/adaptors/ExpandableAdapter.java
@@ -9,11 +9,7 @@
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ExpandableListView;
-import android.widget.ExpandableListView.OnGroupCollapseListener;
-import android.widget.ExpandableListView.OnGroupExpandListener;
 import android.widget.ImageView;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/FavoritesAdaptor.java b/app/src/main/java/ir/ham3da/darya/adaptors/FavoritesAdaptor.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/GDBListAdaptor.java b/app/src/main/java/ir/ham3da/darya/adaptors/GDBListAdaptor.java
@@ -2,7 +2,6 @@
 
 import android.app.Dialog;
 import android.content.Context;
-import android.opengl.Visibility;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -11,7 +10,6 @@
 import android.webkit.URLUtil;
 import android.widget.Button;
 import android.widget.ImageButton;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;

diff --git a/app/src/main/java/ir/ham3da/darya/adaptors/PoetAndBooksAdapter.java b/app/src/main/java/ir/ham3da/darya/adaptors/PoetAndBooksAdapter.java
@@ -4,7 +4,6 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/ir/ham3da/darya/ganjoor/GDBList.java b/app/src/main/java/ir/ham3da/darya/ganjoor/GDBList.java
@@ -3,8 +3,6 @@
  */
 package ir.ham3da.darya.ganjoor;
 
-import android.util.Log;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedList;

diff --git a/app/src/main/java/ir/ham3da/darya/ganjoor/GanjoorDbBrowser.java b/app/src/main/java/ir/ham3da/darya/ganjoor/GanjoorDbBrowser.java
@@ -20,7 +20,6 @@
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.Intent;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;

diff --git a/app/src/main/java/ir/ham3da/darya/imageeditor/EmojiBSFragment.java b/app/src/main/java/ir/ham3da/darya/imageeditor/EmojiBSFragment.java
@@ -10,7 +10,6 @@
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 

diff --git a/app/src/main/java/ir/ham3da/darya/imageeditor/ShadowColorDialogFragment.java b/app/src/main/java/ir/ham3da/darya/imageeditor/ShadowColorDialogFragment.java
@@ -1,16 +1,12 @@
 package ir.ham3da.darya.imageeditor;
 
 import android.app.Dialog;
-import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/ir/ham3da/darya/tools/EditingToolsAdapter.java b/app/src/main/java/ir/ham3da/darya/tools/EditingToolsAdapter.java
@@ -1,6 +1,5 @@
 package ir.ham3da.darya.tools;
 
-import android.app.Application;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,14 +8,12 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 
 import java.util.ArrayList;
 import java.util.List;
 
-import ir.ham3da.darya.App;
 import ir.ham3da.darya.R;
 
 /**

diff --git a/app/src/main/java/ir/ham3da/darya/ui/main/MainPoetsFragment.java b/app/src/main/java/ir/ham3da/darya/ui/main/MainPoetsFragment.java
@@ -1,9 +1,7 @@
 package ir.ham3da.darya.ui.main;
 
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/ir/ham3da/darya/utility/AppFontManager.java b/app/src/main/java/ir/ham3da/darya/utility/AppFontManager.java
@@ -4,7 +4,6 @@
 import android.graphics.Typeface;
 import android.widget.TextView;
 
-import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 
 import java.util.ArrayList;

diff --git a/app/src/main/java/ir/ham3da/darya/utility/AppSettings.java b/app/src/main/java/ir/ham3da/darya/utility/AppSettings.java
@@ -4,10 +4,8 @@
 import ir.ham3da.darya.utility.PreferenceHelper;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -19,7 +17,6 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import ir.ham3da.darya.utility.LangSettingList;
 import ir.ham3da.darya.utility.UtilFunctions;

diff --git a/app/src/main/java/ir/ham3da/darya/utility/DownloadFromUrl.java b/app/src/main/java/ir/ham3da/darya/utility/DownloadFromUrl.java
@@ -1,7 +1,6 @@
 package ir.ham3da.darya.utility;
 
 import android.content.Context;
-import android.util.Log;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/app/src/main/java/ir/ham3da/darya/utility/MyDialogs.java b/app/src/main/java/ir/ham3da/darya/utility/MyDialogs.java
@@ -2,14 +2,11 @@
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
-import android.view.View;
 import android.view.Window;
 import android.webkit.WebView;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ListView;