Update to 1.1.5

l3ger0j · l3ger0j · commit 17351d4fcaaf · 2022-05-15T20:42:19.000+03:00
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
     }
 }
 
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -9,7 +9,7 @@ android {
         applicationId "org.l3ger0j.androidrsidemenudemo"
         minSdk 21
         targetSdk 31
-        versionCode 4
+        versionCode 42
         versionName "1.1.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,12 +25,13 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'org.l3ger0j.demo'
 }
 
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0'
     implementation project(path: ':library')
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.testng:testng:7.5'
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.l3ger0j.demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/demo/src/main/res/drawable/title_bar_menu.png b/demo/src/main/res/drawable/title_bar_menu.png
diff --git a/demo/src/main/res/drawable/title_bar_menu.xml b/demo/src/main/res/drawable/title_bar_menu.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/demo/src/main/res/drawable/title_bar_menu_on.png b/demo/src/main/res/drawable/title_bar_menu_on.png
diff --git a/demo/src/main/res/drawable/title_bar_menu_on.xml b/demo/src/main/res/drawable/title_bar_menu_on.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#BDBCBD"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/library/build.gradle b/library/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 31
-        versionCode 41
-        versionName "1.1.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -31,12 +29,13 @@ android {
     buildFeatures() {
         viewBinding viewBind
     }
+    namespace 'org.l3ger0j.library'
 }
 
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.testng:testng:7.5'
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.l3ger0j.library">
+<manifest>
 
 </manifest>
diff --git a/library/src/main/java/org/l3ger0j/library/ResideMenu.java b/library/src/main/java/org/l3ger0j/library/ResideMenu.java
@@ -10,9 +10,15 @@
 import android.graphics.Rect;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
-import android.widget.*;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
 
@@ -69,7 +75,6 @@ public class ResideMenu extends FrameLayout {
     private float mScaleValue = 0.5f;
     private boolean mUse3D;
     private static final int ROTATE_Y_ANGLE = 10;
-
     public static ImageLoader imageLoader;
 
     /*
@@ -144,31 +149,6 @@ public View getRightMenuView() {
         return scrollViewRightMenu;
     }
 
-    @Override
-    @Deprecated
-    protected boolean fitSystemWindows(@NonNull Rect insets) {
-        // Applies the content insets to the view's padding, consuming that
-        // content (modifying the insets to be 0),
-        // and returning true. This behavior is off by default and can be
-        // enabled through setFitsSystemWindows(boolean)
-        // in api14+ devices.
-
-        // This is added to fix soft navigationBar's overlapping to content above LOLLIPOP
-        int bottomPadding = viewActivity.getPaddingBottom() + insets.bottom;
-        boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
-        boolean hasHomeKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_HOME);
-        if (!hasBackKey || !hasHomeKey) {//there's a navigation bar
-            bottomPadding += getNavigationBarHeight();
-        }
-
-        this.setPadding(viewActivity.getPaddingLeft() + insets.left,
-                viewActivity.getPaddingTop() + insets.top,
-                viewActivity.getPaddingRight() + insets.right,
-                bottomPadding);
-        insets.left = insets.top = insets.right = insets.bottom = 0;
-        return true;
-    }
-
     private int getNavigationBarHeight() {
         Resources resources = getResources();
         int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
diff --git a/library/src/main/java/org/l3ger0j/library/TouchDisableView.java b/library/src/main/java/org/l3ger0j/library/TouchDisableView.java
@@ -6,8 +6,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-class TouchDisableView extends ViewGroup {
-
+public class TouchDisableView extends ViewGroup {
     private View mContent;
 
     //	private int mMode;
diff --git a/library/src/main/res/drawable/shadow.webp b/library/src/main/res/drawable/shadow.webp
diff --git a/library/src/main/res/drawable/shadow.xml b/library/src/main/res/drawable/shadow.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#42000000" />
+    <corners android:radius="10dp" />
+</shape>
diff --git a/library/src/main/res/layout/menu_custom.xml b/library/src/main/res/layout/menu_custom.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <ImageView
         android:id="@+id/iv_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:adjustViewBounds="true"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        tools:ignore="ContentDescription" />
 
     <ImageView
         android:id="@+id/iv_shadow"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:background="@drawable/shadow"
-        android:scaleType="fitXY" />
+        android:scaleType="fitXY"
+        tools:ignore="ContentDescription" />
 
     <RelativeLayout
         android:id="@+id/sv_menu_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
-        
     </RelativeLayout>
 
 </merge>
diff --git a/library/src/main/res/layout/menu_custom_left_scrollview.xml b/library/src/main/res/layout/menu_custom_left_scrollview.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sv_left_menu"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ScrollView
-        android:id="@+id/sv_left_menu"
+    android:layout_height="match_parent"
+    android:layout_marginStart="30dp"
+    android:scrollbars="none" >
+    <LinearLayout
+        android:id="@+id/layout_left_menu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="30dp"
-        android:scrollbars="none" >
-
-        <LinearLayout
-            android:id="@+id/layout_left_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </ScrollView>
-
-</RelativeLayout>
+        android:layout_gravity="left|center_vertical"
+        android:orientation="vertical" />
+</ScrollView>
diff --git a/library/src/main/res/layout/menu_custom_right_scrollview.xml b/library/src/main/res/layout/menu_custom_right_scrollview.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sv_right_menu"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ScrollView
-        android:id="@+id/sv_right_menu"
+    android:layout_height="match_parent"
+    android:layout_marginRight="30dp"
+    android:scrollbars="none">
+    <LinearLayout
+        android:id="@+id/layout_right_menu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="30dp"
-        android:scrollbars="none" >
-
-        <LinearLayout
-            android:id="@+id/layout_right_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="right"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </ScrollView>
-
-</RelativeLayout>
+        android:layout_gravity="right|center_vertical"
+        android:orientation="vertical" />
+</ScrollView>
diff --git a/library/src/main/res/layout/menu_item.xml b/library/src/main/res/layout/menu_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:gravity="center_vertical"
@@ -12,7 +12,8 @@
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:scaleType="centerCrop"
-            android:id="@+id/iv_icon"/>
+            android:id="@+id/iv_icon"
+        tools:ignore="ContentDescription" />
 
     <TextView
             android:layout_width="match_parent"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:7.1.3'`
	`7`	`+ classpath 'com.android.tools.build:gradle:7.2.0'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`