Dialog theme fixed

marcoscgdev · Apr 21, 2019 · 6ce8da4 · 6ce8da4
1 parent abe08b9
commit 6ce8da4
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 56 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,6 +24,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
     implementation project(':dialogsheet')
     testImplementation 'junit:junit:4.12'
 }
diff --git a/dialogsheet/build.gradle b/dialogsheet/build.gradle
@@ -19,11 +19,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    testImplementation 'junit:junit:4.12'
+    api 'com.android.support:appcompat-v7:28.0.0'
+    api 'com.android.support:design:28.0.0'
 }
diff --git a/dialogsheet/src/androidTest/java/com/marcoscg/dialogsheet/ExampleInstrumentedTest.java b/dialogsheet/src/androidTest/java/com/marcoscg/dialogsheet/ExampleInstrumentedTest.java
diff --git a/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.java b/dialogsheet/src/main/java/com/marcoscg/dialogsheet/DialogSheet.java
@@ -14,10 +14,10 @@
 import android.support.annotation.DrawableRes;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.StringRes;
-import android.support.design.button.MaterialButton;
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.design.widget.BottomSheetDialog;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.AppCompatButton;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -42,7 +42,7 @@ public class DialogSheet {
 
     private TextView titleTextView, messageTextView;
     private ImageView iconImageView;
-    private MaterialButton positiveButton, negativeButton;
+    private AppCompatButton positiveButton, negativeButton;
     private RelativeLayout textContainer;
     private LinearLayout messageContainer;
 
@@ -395,8 +395,8 @@ public void onShow(DialogInterface dialog) {
         titleTextView = (TextView) bottomSheetDialog.findViewById(R.id.dialogTitle);
         messageTextView = (TextView) bottomSheetDialog.findViewById(R.id.dialogMessage);
         iconImageView = (ImageView) bottomSheetDialog.findViewById(R.id.dialogIcon);
-        positiveButton = (MaterialButton) bottomSheetDialog.findViewById(R.id.buttonPositive);
-        negativeButton = (MaterialButton) bottomSheetDialog.findViewById(R.id.buttonNegative);
+        positiveButton = (AppCompatButton) bottomSheetDialog.findViewById(R.id.buttonPositive);
+        negativeButton = (AppCompatButton) bottomSheetDialog.findViewById(R.id.buttonNegative);
         textContainer = (RelativeLayout) bottomSheetDialog.findViewById(R.id.textContainer);
         messageContainer = (LinearLayout) bottomSheetDialog.findViewById(R.id.messageContainer);
 

diff --git a/dialogsheet/src/main/res/values/styles.xml b/dialogsheet/src/main/res/values/styles.xml
@@ -1,8 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Base application theme. -->
     <style name="DialogSheetTheme" parent="Theme.MaterialComponents.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
         <item name="colorAccent">?dialogSheetAccent</item>
         <item name="android:colorBackground">@android:color/transparent</item>
         <item name="android:statusBarColor" tools:targetApi="21">@android:color/transparent</item>

diff --git a/dialogsheet/src/test/java/com/marcoscg/dialogsheet/ExampleUnitTest.java b/dialogsheet/src/test/java/com/marcoscg/dialogsheet/ExampleUnitTest.java