bug fixed

eneskarpuzoglu · eneskarpuzoglu · commit 70cb6da1e235 · 2020-11-05T09:55:51.000+03:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,5 +28,6 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
     implementation project(':fastdialog')
 }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/fastdialog/build.gradle b/fastdialog/build.gradle
@@ -30,9 +30,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //noinspection GradleCompatible
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation "com.airbnb.android:lottie:2.7.0"
-    implementation 'com.jakewharton:butterknife:10.1.0'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation "com.airbnb.android:lottie:3.4.0"
+    implementation 'com.jakewharton:butterknife:10.2.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
     implementation 'com.shawnlin:number-picker:2.4.8'
 }
diff --git a/fastdialog/src/main/java/karpuzoglu/enes/com/fastdialog/FastDialogBuilder.java b/fastdialog/src/main/java/karpuzoglu/enes/com/fastdialog/FastDialogBuilder.java
@@ -179,10 +179,10 @@ private GradientDrawable getShape(){
             shape.setColor(ContextCompat.getColor(context,R.color.warning));
             shape.setStroke(3, ContextCompat.getColor(context,R.color.warning));
         }else{
-            tvTitle.setBackgroundColor(ContextCompat.getColor(context,R.color.primary));
+            tvTitle.setBackgroundColor(ContextCompat.getColor(context,R.color.colorPrimary));
             tvTitle.setText(context.getResources().getString(R.string.dialog));
-            shape.setColor(ContextCompat.getColor(context,R.color.primary));
-            shape.setStroke(3, ContextCompat.getColor(context,R.color.primary));
+            shape.setColor(ContextCompat.getColor(context,R.color.colorPrimary));
+            shape.setStroke(3, ContextCompat.getColor(context,R.color.colorPrimary));
        }
 
         return shape;
diff --git a/fastdialog/src/main/res/layout/folder_dialog.xml b/fastdialog/src/main/res/layout/folder_dialog.xml
@@ -8,7 +8,7 @@
         android:layout_height="wrap_content"
         android:padding="10dp"
         android:orientation="vertical"
-        android:background="@color/primary"
+        android:background="?colorPrimaryDark"
         >
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/folder_recylerview"
diff --git a/fastdialog/src/main/res/layout/login_dialog.xml b/fastdialog/src/main/res/layout/login_dialog.xml
@@ -12,11 +12,11 @@
             android:id="@+id/login_dialog_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/primary"
+            android:textColor="?colorOnPrimary"
             android:gravity="center"
             android:padding="5dp"
             android:text="@string/login"
-            android:textColor="@color/text2"
+            android:background="?colorPrimaryDark"
             android:textSize="15dp"
             android:textStyle="bold" />
         <TextView
@@ -38,7 +38,6 @@
             android:background="@drawable/custom_edittext_dialog"
             android:inputType="textEmailAddress"
             android:padding="10dp"
-            android:textColor="@color/text"
             android:textSize="15dp" />
         <karpuzoglu.enes.com.fastdialog.ClearableEditText
             android:id="@+id/login_dialog_password"
@@ -50,7 +49,6 @@
             android:background="@drawable/custom_edittext_dialog"
             android:padding="10dp"
             android:inputType="textPassword"
-            android:textColor="@color/text"
             android:textSize="15dp" />
         <LinearLayout
             android:layout_width="match_parent"
@@ -60,7 +58,7 @@
                 android:id="@+id/warning_dialog_cancel_bt"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:textColor="@color/text2"
+                android:textColor="?colorOnPrimary"
                 android:layout_margin="15dp"
                 android:textSize="20dp"
                 android:text="@string/cancel"
@@ -70,7 +68,7 @@
                 android:id="@+id/warning_dialog_ok_bt"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:textColor="@color/text2"
+                android:textColor="?colorOnPrimary"
                 android:layout_margin="15dp"
                 android:textSize="20dp"
                 android:textAllCaps="false"
diff --git a/fastdialog/src/main/res/layout/number_picker_dialog.xml b/fastdialog/src/main/res/layout/number_picker_dialog.xml
@@ -12,11 +12,11 @@
             android:id="@+id/dialog_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/primary"
+            android:textColor="?colorOnPrimary"
             android:gravity="center"
             android:padding="5dp"
             android:text="@string/choice"
-            android:textColor="@color/text2"
+            android:background="?colorPrimaryDark"
             android:textSize="15dp"
             android:textStyle="bold" />
 
@@ -28,7 +28,6 @@
             android:text="@string/choice"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
-            android:textColor="@color/text"
             android:gravity="center"/>
 
         <com.shawnlin.numberpicker.NumberPicker
@@ -51,7 +50,7 @@
                 android:id="@+id/warning_dialog_cancel_bt"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:textColor="@color/text2"
+                android:textColor="?colorOnPrimary"
                 android:layout_margin="15dp"
                 android:textSize="20dp"
                 android:text="@string/cancel"
@@ -61,7 +60,7 @@
                 android:id="@+id/warning_dialog_ok_bt"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:textColor="@color/text2"
+                android:textColor="?colorOnPrimary"
                 android:layout_margin="15dp"
                 android:textSize="20dp"
                 android:textAllCaps="false"
diff --git a/fastdialog/src/main/res/layout/progress_dialog.xml b/fastdialog/src/main/res/layout/progress_dialog.xml
@@ -23,7 +23,6 @@
             android:layout_height="wrap_content"
             android:textSize="20dp"
             android:text="@string/please_wait"
-            android:textColor="@color/text"
             android:gravity="center"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/fastdialog/src/main/res/layout/warning_dialog.xml b/fastdialog/src/main/res/layout/warning_dialog.xml
@@ -12,11 +12,11 @@
             android:id="@+id/warning_dialog_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/primary"
+            android:background="?colorPrimaryDark"
             android:gravity="center"
             android:padding="5dp"
             android:text="@string/warning"
-            android:textColor="@color/text2"
+            android:textColor="?colorOnPrimary"
             android:textSize="15sp"
             android:textStyle="bold" />
         <LinearLayout
@@ -37,7 +37,6 @@
                 android:id="@+id/warning_dialog_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/text"
                 android:gravity="center"
                 android:textSize="15sp"
                 android:padding="5dp"/>
@@ -50,7 +49,6 @@
             android:layout_marginRight="15dp"
             android:background="@drawable/custom_edittext_dialog"
             android:padding="10dp"
-            android:textColor="@color/text"
             android:textSize="15sp" />
         <karpuzoglu.enes.com.fastdialog.ClearableEditText
             android:id="@+id/warning_dialog_et_decimal"
@@ -61,7 +59,6 @@
             android:background="@drawable/custom_edittext_dialog"
             android:padding="10dp"
             android:inputType="numberDecimal"
-            android:textColor="@color/text"
             android:textSize="15sp" />
         <karpuzoglu.enes.com.fastdialog.ClearableEditText
             android:id="@+id/warning_dialog_et_number"
@@ -72,7 +69,6 @@
             android:background="@drawable/custom_edittext_dialog"
             android:padding="10dp"
             android:inputType="number"
-            android:textColor="@color/text"
             android:textSize="15sp" />
         <LinearLayout
             android:layout_width="match_parent"
@@ -82,7 +78,7 @@
                 android:id="@+id/warning_dialog_cancel_bt"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:textColor="@color/text2"
+                android:textColor="?colorOnPrimary"
                 android:layout_margin="15dp"
                 android:textSize="20sp"
                 android:text="@string/cancel"
@@ -92,7 +88,7 @@
                 android:id="@+id/warning_dialog_ok_bt"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
-                android:textColor="@color/text2"
+                android:textColor="?colorOnPrimary"
                 android:layout_margin="15dp"
                 android:textSize="20sp"
                 android:textAllCaps="false"
diff --git a/fastdialog/src/main/res/values/colors.xml b/fastdialog/src/main/res/values/colors.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#B33A3A</color>
     <color name="transparent">#00000000</color>
     <color name="error">#D9534F</color>
     <color name="warning">#F0AD4E</color>
diff --git a/fastdialog/src/main/res/values/styles.xml b/fastdialog/src/main/res/values/styles.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+        <style name="AppTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
     <style name="dialog_slide_left">
         <item name="android:windowEnterAnimation">@anim/slide_in_left</item>
         <item name="android:windowExitAnimation">@anim/slide_out_left</item>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 02 13:51:54 EET 2020
+#Thu Nov 05 09:42:03 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ dependencies {`
`28`	`28`	`implementation fileTree(include: ['*.jar'], dir: 'libs')`
`29`	`29`	`implementation 'androidx.appcompat:appcompat:1.1.0'`
`30`	`30`	`implementation 'androidx.constraintlayout:constraintlayout:1.1.3'`
	`31`	`+ implementation 'com.google.android.material:material:1.3.0-alpha03'`
`31`	`32`	`implementation project(':fastdialog')`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.6.1'`
	`10`	`+ classpath 'com.android.tools.build:gradle:4.1.0'`
`11`	`11`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`android:layout_height="wrap_content"`
`9`	`9`	`android:padding="10dp"`
`10`	`10`	`android:orientation="vertical"`
`11`		`- android:background="@color/primary"`
	`11`	`+ android:background="?colorPrimaryDark"`
`12`	`12`	`>`
`13`	`13`	`<androidx.recyclerview.widget.RecyclerView`
`14`	`14`	`android:id="@+id/folder_recylerview"`