Merge pull request #4 from SlaVcE14/v1.2.1

V1.2.1

.gitignore

@@ -13,4 +13,5 @@
 .externalNativeBuild
 .cxx
 local.properties
-/app
+/app
+/.idea

settings.gradle

@@ -8,3 +8,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "My Library 2"
 include ':sjlibrary'
+include ':app'

sjlibrary/build.gradle

@@ -7,9 +7,8 @@ android {
 
     defaultConfig {
         minSdk 23
-        targetSdk 31
-        versionCode 3
-        versionName "1.2"
+        versionCode 4
+        versionName "1.2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

sjlibrary/src/main/java/com/sjapps/library/customdialog/SetupDialog.java

@@ -2,9 +2,11 @@
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -19,6 +21,7 @@
 public class SetupDialog {
     public Dialog dialog;
     public Button button1, button2;
+    private int maxWidth = 600;
 
     public SetupDialog (){
 
@@ -52,7 +55,7 @@ public SetupDialog DialogBuilder(Context context,String Title,String Text, Strin
             TextView msg = (TextView)dialog.findViewById(R.id.textView);
             msg.setText(Text);
         }
-        dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        SetDialogSize(context);
         TextView TitleTv = (TextView)dialog.findViewById(R.id.TitleText);
         dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         button1 = (Button)dialog.findViewById(R.id.Btn1);
@@ -77,6 +80,21 @@ public void onClick(View v) {
         return this;
     }
 
+    public void dismiss(){
+        dialog.dismiss();
+    }
+
+    private void SetDialogSize(Context context){
+        Configuration configuration = context.getResources().getConfiguration();
+        if (configuration.screenWidthDp > maxWidth)
+            dialog.getWindow().setLayout(dpToPixels(context,maxWidth), ViewGroup.LayoutParams.WRAP_CONTENT);
+        else dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    }
+
+    private int dpToPixels(Context context, float dp) {
+        Resources r = context.getResources();
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+    }
 
 
     public void onButtonClick(DialogButtonEvents dialogButtonEvents){

sjlibrary/src/main/res/layout/popup_panel.xml

@@ -2,16 +2,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginBottom="20dp"
+
     >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="10dp"
         android:background="@drawable/background"
         android:gravity="bottom"
+        android:layout_marginHorizontal="10dp"
         android:orientation="vertical">
 
         <TextView

sjlibrary/src/main/res/layout/popup_panel_long.xml

@@ -2,14 +2,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginBottom="20dp"
     >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="10dp"
+        android:layout_marginHorizontal="10dp"
         android:background="@drawable/background"
         android:gravity="bottom"
         android:orientation="vertical">
@@ -19,32 +18,31 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginTop="20dp"
             android:layout_weight="1"
             android:text="Title"
             android:textAlignment="center"
-            android:textSize="25dp"
-            android:layout_marginTop="20dp"
-            />
+            android:textSize="25dp" />
+
         <TextView
             android:id="@+id/textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginTop="20dp"
             android:layout_weight="1"
             android:text="message here"
-            android:layout_marginHorizontal="20dp"
             android:textAlignment="center"
-            android:textSize="20dp"
-            android:layout_marginTop="20dp"
-            />
+            android:textSize="20dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20dp"
             android:layout_marginTop="20dp"
-            android:orientation="horizontal"
-            android:layout_marginBottom="20dp">
+            android:layout_marginBottom="20dp"
+            android:orientation="horizontal">
 
 
             <Button