app: introduce 1.0.9

- code cleanup - gave the SearchActvity UI a fresher look & minor UI fixes - gradle update
verNANDo57 · Nov 2, 2021 · e6c3fd3 · e6c3fd3
1 parent 272ed50
commit e6c3fd3
Show file tree

Hide file tree

Showing 46 changed files with 206 additions and 1,225 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.verNANDo57.rulebook_educational"
         minSdkVersion 22
         targetSdkVersion 30
-        versionCode 108
-        versionName '1.0.8'
+        versionCode 109
+        versionName '1.0.9'
         multiDexEnabled true
     }
 
@@ -51,7 +51,7 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0-RC'
 }
 repositories {
     mavenCentral()

diff --git a/app/src/main/java/com/verNANDo57/rulebook_educational/AppAboutApplicationActivity.java b/app/src/main/java/com/verNANDo57/rulebook_educational/AppAboutApplicationActivity.java
@@ -55,7 +55,7 @@ public void onClick(View view){
 		bar_in_credits.setNavigationOnClickListener(new NavigationView.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				BottomNavBetweenActivitiesFragment BottomNavBetweenActivities = new BottomNavBetweenActivitiesFragment();
+				BottomNavAmongActivitiesFragment BottomNavBetweenActivities = new BottomNavAmongActivitiesFragment();
 				BottomNavBetweenActivities.show(getSupportFragmentManager(), LOG_TAG);
 			}
 		});

diff --git a/app/src/main/java/com/verNANDo57/rulebook_educational/AppChooseYourDestiny.java b/app/src/main/java/com/verNANDo57/rulebook_educational/AppChooseYourDestiny.java
@@ -36,7 +36,7 @@ public void onCreate(Bundle savedInstanceState){
         toolbar.setNavigationOnClickListener(new NavigationView.OnClickListener() {
             @Override
             public void onClick(View v) {
-                BottomNavBetweenActivitiesFragment BottomNavBetweenActivities = new BottomNavBetweenActivitiesFragment();
+                BottomNavAmongActivitiesFragment BottomNavBetweenActivities = new BottomNavAmongActivitiesFragment();
                 BottomNavBetweenActivities.show(getSupportFragmentManager(), LOG_TAG);
             }
         });

diff --git a/...l/BottomNavBetweenActivitiesFragment.java → ...nal/BottomNavAmongActivitiesFragment.java b/...l/BottomNavBetweenActivitiesFragment.java → ...nal/BottomNavAmongActivitiesFragment.java
@@ -16,17 +16,17 @@
 import com.verNANDo57.rulebook_educational.preferences.AppSettingsActivity;
 import com.verNANDo57.rulebook_educational.rules.dictionaries.AppDictionaries;
 
-public class BottomNavBetweenActivitiesFragment extends CustomThemeEngineBottomSheetDialogFragment {
+public class BottomNavAmongActivitiesFragment extends CustomThemeEngineBottomSheetDialogFragment {
 
-    public BottomNavBetweenActivitiesFragment(){
+    public BottomNavAmongActivitiesFragment(){
         //Required empty public constructor
     }
 
     @SuppressLint("NonConstantResourceId")
     public View onCreateView(LayoutInflater inflater , ViewGroup container, Bundle savedInstanceState) {
-        View viewFragment = inflater.inflate(R.layout.fragment_bottomsheet_between_activities, container, false);
+        View viewFragment = inflater.inflate(R.layout.fragment_bottomsheet_among_activities, container, false);
 
-        NavigationView navigationbetweenlessons = viewFragment.findViewById(R.id.navigation_view_between_activities);
+        NavigationView navigationbetweenlessons = viewFragment.findViewById(R.id.navigation_view_among_activities);
         navigationbetweenlessons.setBackgroundColor(getResources().getColor(R.color.bottomsheetdialog_background));
         navigationbetweenlessons.setItemTextColor(ColorStateList.valueOf(ColorUtils.lighter(getResources().getColor(R.color.bottomsheetdialog_primary), 0.01f)));
         navigationbetweenlessons.setItemIconTintList(ColorStateList.valueOf(ColorUtils.lighter(getResources().getColor(R.color.bottomsheetdialog_accent), 0.01f)));

diff --git a/...onal/BottomNavBetweenLessonsFragment.java → ...tional/BottomNavAmongLessonsFragment.java b/...onal/BottomNavBetweenLessonsFragment.java → ...tional/BottomNavAmongLessonsFragment.java
@@ -17,21 +17,21 @@
 import com.verNANDo57.rulebook_educational.rules.mainrules.AppMainRulesActivity;
 import com.verNANDo57.rulebook_educational.search.AppSearchActivity;
 
-public class BottomNavBetweenLessonsFragment extends CustomThemeEngineBottomSheetDialogFragment {
+public class BottomNavAmongLessonsFragment extends CustomThemeEngineBottomSheetDialogFragment {
 
-    public BottomNavBetweenLessonsFragment(){
+    public BottomNavAmongLessonsFragment(){
         //Required empty public constructor
     }
 
     @SuppressLint("NonConstantResourceId")
     public View onCreateView(LayoutInflater inflater , ViewGroup container, Bundle savedInstanceState) {
-        View viewFragment = inflater.inflate(R.layout.fragment_bottomsheet_between_lessons, container, false);
+        View viewFragment = inflater.inflate(R.layout.fragment_bottomsheet_among_lessons, container, false);
 
-        NavigationView navigationbetweenactivities = viewFragment.findViewById(R.id.navigation_view_between_lessons);
-        navigationbetweenactivities.setBackgroundColor(getResources().getColor(R.color.bottomsheetdialog_background));
-        navigationbetweenactivities.setItemTextColor(ColorStateList.valueOf(ColorUtils.lighter(getResources().getColor(R.color.bottomsheetdialog_primary), 0.01f)));
-        navigationbetweenactivities.setItemIconTintList(ColorStateList.valueOf(ColorUtils.lighter(getResources().getColor(R.color.bottomsheetdialog_accent), 0.01f)));
-        navigationbetweenactivities.setNavigationItemSelectedListener(menuItem -> {
+        NavigationView navigation_among_activities = viewFragment.findViewById(R.id.navigation_view_among_lessons);
+        navigation_among_activities.setBackgroundColor(getResources().getColor(R.color.bottomsheetdialog_background));
+        navigation_among_activities.setItemTextColor(ColorStateList.valueOf(ColorUtils.lighter(getResources().getColor(R.color.bottomsheetdialog_primary), 0.01f)));
+        navigation_among_activities.setItemIconTintList(ColorStateList.valueOf(ColorUtils.lighter(getResources().getColor(R.color.bottomsheetdialog_accent), 0.01f)));
+        navigation_among_activities.setNavigationItemSelectedListener(menuItem -> {
             int id = menuItem.getItemId();
 
             switch (id)

diff --git a/app/src/main/java/com/verNANDo57/rulebook_educational/colorpicker/ColorPickerDialog.java b/app/src/main/java/com/verNANDo57/rulebook_educational/colorpicker/ColorPickerDialog.java
@@ -43,6 +43,7 @@
 
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  * <p>A dialog to pick a color.</p>
@@ -150,8 +151,10 @@ public static Builder newBuilder() {
     return new Builder();
   }
 
+  @NonNull
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
+    assert getArguments() != null;
     dialogId = getArguments().getInt(ARG_ID);
     showAlphaSlider = getArguments().getBoolean(ARG_ALPHA);
     showColorShades = getArguments().getBoolean(ARG_SHOW_COLOR_SHADES);
@@ -184,6 +187,7 @@ public void onClick(DialogInterface dialog, int which) {
           }
         });
 
+    assert getArguments() != null;
     int dialogTitleStringRes = getArguments().getInt(ARG_DIALOG_TITLE);
     if (dialogTitleStringRes != 0) {
       builder.setTitle(dialogTitleStringRes);
@@ -243,7 +247,7 @@ public void onClick(View v) {
   }
 
   @Override
-  public void onDismiss(DialogInterface dialog) {
+  public void onDismiss(@NonNull DialogInterface dialog) {
     super.onDismiss(dialog);
     onDialogDismissed();
   }
@@ -280,14 +284,15 @@ View createPickerView() {
     try {
       final TypedValue value = new TypedValue();
       TypedArray typedArray =
-          getActivity().obtainStyledAttributes(value.data, new int[] { android.R.attr.textColorPrimary });
+          requireActivity().obtainStyledAttributes(value.data, new int[] { android.R.attr.textColorPrimary });
       int arrowColor = typedArray.getColor(0, Color.BLACK);
       typedArray.recycle();
       arrowRight.setColorFilter(arrowColor);
     } catch (Exception ignored) {
     }
 
     colorPicker.setAlphaSliderVisible(showAlphaSlider);
+    assert getArguments() != null;
     oldColorPanel.setColor(getArguments().getInt(ARG_COLOR));
     colorPicker.setColor(color, true);
     newColorPanel.setColor(color);
@@ -315,7 +320,7 @@ public void onClick(View v) {
       @Override
       public void onFocusChange(View v, boolean hasFocus) {
         if (hasFocus) {
-          InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+          InputMethodManager imm = (InputMethodManager) requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
           imm.showSoftInput(hexEditText, InputMethodManager.SHOW_IMPLICIT);
         }
       }
@@ -333,7 +338,7 @@ public void onColorChanged(int newColor) {
     if (!fromEditText && hexEditText != null) {
       setHex(newColor);
       if (hexEditText.hasFocus()) {
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager) requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.hideSoftInputFromWindow(hexEditText.getWindowToken(), 0);
         hexEditText.clearFocus();
       }
@@ -474,6 +479,7 @@ public void onColorSelected(int newColor) {
 
   private void loadPresets() {
     int alpha = Color.alpha(color);
+    assert getArguments() != null;
     presets = getArguments().getIntArray(ARG_PRESETS);
     if (presets == null) presets = MATERIAL_COLORS;
     boolean isMaterialColors = presets == MATERIAL_COLORS;
@@ -749,7 +755,6 @@ private int getSelectedItemPosition() {
 
   public static final class Builder {
 
-    ColorPickerDialogListener colorPickerDialogListener;
     @StringRes
     int dialogTitle = R.string.colorpicker_default_title;
     @StringRes

diff --git a/app/src/main/java/com/verNANDo57/rulebook_educational/colorpicker/ColorPickerView.java b/app/src/main/java/com/verNANDo57/rulebook_educational/colorpicker/ColorPickerView.java
@@ -618,7 +618,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         }
 
         finalWidth = widthAllowed;
-      } else if (heightMode == MeasureSpec.EXACTLY && widthMode != MeasureSpec.EXACTLY) {
+      } else if (widthMode != MeasureSpec.EXACTLY) {
         //The height has been specified exactly, we need to stay within this height and adopt the width.
 
         int w = (heightAllowed + panelSpacingPx + huePanelWidthPx);
@@ -627,12 +627,8 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
           w -= (panelSpacingPx + alphaPanelHeightPx);
         }
 
-        if (w > widthAllowed) {
-          //we can't fit within this container, set the size to whatever was allowed.
-          finalWidth = widthAllowed;
-        } else {
-          finalWidth = w;
-        }
+        //we can't fit within this container, set the size to whatever was allowed.
+        finalWidth = Math.min(w, widthAllowed);
 
         finalHeight = heightAllowed;
       } else {
@@ -676,7 +672,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       } else if (!heightOk && widthOk) {
         finalHeight = heightAllowed;
         finalWidth = widthNeeded;
-      } else if (!widthOk && heightOk) {
+      } else if (heightOk) {
         finalHeight = heightNeeded;
         finalWidth = widthAllowed;
       } else {