Skip to content

Commit ff96566

Browse files
gzeinnumergzeinnumer
committed
bug Fixing
1 parent cd74b2b commit ff96566

10 files changed

Lines changed: 44 additions & 92 deletions

File tree

‎.idea/jarRepositories.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</h1>
77

88
<div align="center">
9-
<a><img src="https://img.shields.io/badge/Version-2.0.6-brightgreen.svg?style=flat"></a>
9+
<a><img src="https://img.shields.io/badge/Version-2.0.7-brightgreen.svg?style=flat"></a>
1010
<a><img src="https://img.shields.io/badge/ID-gzeinnumer-blue.svg?style=flat"></a>
1111
<a><img src="https://img.shields.io/badge/Java-Suport-green?logo=java&style=flat"></a>
1212
<a><img src="https://img.shields.io/badge/Koltin-Suport-green?logo=kotlin&style=flat"></a>
@@ -32,7 +32,8 @@ allprojects {
3232
dependencies {
3333
...
3434
implementation 'com.github.gzeinnumer:MyLibDialogSearchView:version'
35-
implementation 'com.google.android.material:material:1.2.0'
35+
implementation 'com.github.gzeinnumer:MyLibStyle:0.1.3'
36+
implementation 'com.google.android.material:material:1.2.1'
3637
}
3738
```
3839

@@ -267,6 +268,8 @@ You can Customize your dialog UI. [**ReadMore**](https://github.com/gzeinnumer/M
267268
- Bug Style
268269
- **2.0.6**
269270
- Color
271+
- **2.0.7**
272+
- Bug Fixing
270273

271274
---
272275

‎app/src/main/java/com/gzeinnumer/mylibsearchviewdialog/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ private void initDialogSingleGZeinNumer2() {
338338
listObject.add(new ExampleModel(4, "Zein4", "Balbar4"));
339339

340340
new SearchViewDialog<ExampleModel>(getSupportFragmentManager())
341-
.setAnimationStyle(R.style.LibSearchViewDialog_DialogStyle_In)
341+
.setAnimationStyle(R.style.DialogStyle_In)
342342
.setItems(listObject)
343343
.setTitle("ini title")
344344
.setContent("ini content")

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ allprojects {
1616
repositories {
1717
google()
1818
jcenter()
19+
20+
maven { url 'https://jitpack.io' }
1921
}
2022
}
2123

‎lib/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ android {
3131
dependencies {
3232

3333
implementation 'androidx.appcompat:appcompat:1.2.0'
34-
implementation 'com.google.android.material:material:1.2.1'
3534
testImplementation 'junit:junit:4.+'
3635
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
3736
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
37+
38+
implementation 'com.github.gzeinnumer:MyLibStyle:0.1.3'
39+
implementation 'com.google.android.material:material:1.2.1'
3840
}

‎lib/src/main/java/com/gzeinnumer/mylibsearchviewdialog/dialog/BaseDialog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public abstract class BaseDialog extends DialogFragment {
2727
protected double canvasWidth = 0.9;
2828
protected boolean isFullScreen = false;
2929

30-
protected int animationStyle = R.style.LibSearchViewDialog_DialogStyle_Slide;
30+
protected int animationStyle = R.style.DialogStyle_Slide;
3131

3232
@Override
3333
public void onActivityCreated(@Nullable Bundle savedInstanceState) {

‎lib/src/main/res/layout/item_rv_single.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<CheckedTextView
99
android:id="@+id/checked_text_item"
10-
style="@style/LibSearchViewDialog_MyTextContent"
10+
style="@style/MyTextContent"
1111
android:layout_width="match_parent"
1212
android:checkMark="?android:attr/listChoiceIndicatorSingle"
1313
android:checkMarkTint="@color/colorPrimary"
@@ -19,7 +19,7 @@
1919

2020
<View
2121
android:id="@+id/divider"
22-
style="@style/LibSearchViewDialog_MyDivider"
22+
style="@style/MyDivider"
2323
android:layout_marginTop="0dp" />
2424

2525
</LinearLayout>

‎lib/src/main/res/layout/select_dialog.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<TextView
2020
android:id="@+id/tv_title"
21-
style="@style/LibSearchViewDialog_MyTextHeader"
21+
style="@style/MyTextHeader"
2222
android:layout_width="match_parent"
2323
android:layout_marginTop="0dp"
2424
android:layout_marginBottom="10dp"
@@ -27,7 +27,7 @@
2727

2828
<TextView
2929
android:id="@+id/tv_content"
30-
style="@style/LibSearchViewDialog_MyTextContent"
30+
style="@style/MyTextContent"
3131
android:layout_width="match_parent"
3232
android:layout_marginTop="0dp"
3333
android:layout_marginBottom="@dimen/text_margin"
@@ -36,7 +36,7 @@
3636

3737
<com.google.android.material.textfield.TextInputLayout
3838
android:id="@+id/parent_ed_search"
39-
style="@style/LibSearchViewDialog_MyTextInputLayoutOutlinedBox"
39+
style="@style/MyTextInputLayoutOutlinedBox"
4040
android:layout_width="match_parent"
4141
android:layout_marginTop="0dp"
4242
android:layout_marginBottom="10dp"
@@ -45,7 +45,7 @@
4545

4646
<com.google.android.material.textfield.TextInputEditText
4747
android:id="@+id/ed_search"
48-
style="@style/LibSearchViewDialog_MyTextInputEditText" />
48+
style="@style/MyTextInputEditText" />
4949

5050
</com.google.android.material.textfield.TextInputLayout>
5151

@@ -66,42 +66,42 @@
6666

6767
<Button
6868
android:id="@+id/d_btn_cancel_MBT"
69-
style="@style/LibSearchViewDialog_MyButtonText"
69+
style="@style/MyButtonText"
7070
android:layout_marginEnd="@dimen/def_margin"
7171
android:text="@string/cancel"
7272
android:visibility="gone"
7373
tools:visibility="visible" />
7474

7575
<Button
7676
android:id="@+id/d_btn_ok_MBT"
77-
style="@style/LibSearchViewDialog_MyButtonText"
77+
style="@style/MyButtonText"
7878
android:text="@string/ok"
7979
android:visibility="gone"
8080
tools:visibility="visible" />
8181

8282
<Button
8383
android:id="@+id/d_btn_cancel_MBO"
84-
style="@style/LibSearchViewDialog_MyButtonOutlined"
84+
style="@style/MyButtonOutlined"
8585
android:layout_marginEnd="@dimen/def_margin"
8686
android:text="@string/cancel"
8787
android:visibility="gone" />
8888

8989
<Button
9090
android:id="@+id/d_btn_ok_MBO"
91-
style="@style/LibSearchViewDialog_MyButtonOutlined"
91+
style="@style/MyButtonOutlined"
9292
android:text="@string/ok"
9393
android:visibility="gone" />
9494

9595
<Button
9696
android:id="@+id/d_btn_cancel_MBC"
97-
style="@style/LibSearchViewDialog_MyButtonContained"
97+
style="@style/MyButtonContained"
9898
android:layout_marginEnd="@dimen/def_margin"
9999
android:text="@string/cancel"
100100
android:visibility="gone" />
101101

102102
<Button
103103
android:id="@+id/d_btn_ok_MBC"
104-
style="@style/LibSearchViewDialog_MyButtonContained"
104+
style="@style/MyButtonContained"
105105
android:text="@string/ok"
106106
android:visibility="gone" />
107107

‎lib/src/main/res/layout/select_dialog_fullscreen.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<TextView
2121
android:id="@+id/tv_title"
22-
style="@style/LibSearchViewDialog_MyTextHeader"
22+
style="@style/MyTextHeader"
2323
android:layout_width="match_parent"
2424
android:layout_marginTop="0dp"
2525
android:layout_marginBottom="10dp"
@@ -28,15 +28,15 @@
2828

2929
<TextView
3030
android:id="@+id/tv_content"
31-
style="@style/LibSearchViewDialog_MyTextContent"
31+
style="@style/MyTextContent"
3232
android:layout_width="match_parent"
3333
android:layout_marginTop="0dp"
3434
android:layout_marginBottom="@dimen/text_margin"
3535
android:text="@string/content_dialog" />
3636

3737
<com.google.android.material.textfield.TextInputLayout
3838
android:id="@+id/parent_ed_search"
39-
style="@style/LibSearchViewDialog_MyTextInputLayoutOutlinedBox"
39+
style="@style/MyTextInputLayoutOutlinedBox"
4040
android:layout_width="match_parent"
4141
android:layout_marginTop="0dp"
4242
android:layout_marginBottom="10dp"
@@ -45,7 +45,7 @@
4545

4646
<com.google.android.material.textfield.TextInputEditText
4747
android:id="@+id/ed_search"
48-
style="@style/LibSearchViewDialog_MyTextInputEditText" />
48+
style="@style/MyTextInputEditText" />
4949

5050
</com.google.android.material.textfield.TextInputLayout>
5151

@@ -67,42 +67,42 @@
6767

6868
<Button
6969
android:id="@+id/d_btn_cancel_MBT"
70-
style="@style/LibSearchViewDialog_MyButtonText"
70+
style="@style/MyButtonText"
7171
android:layout_marginEnd="@dimen/def_margin"
7272
android:text="@string/cancel"
7373
android:visibility="gone"
7474
tools:visibility="visible" />
7575

7676
<Button
7777
android:id="@+id/d_btn_ok_MBT"
78-
style="@style/LibSearchViewDialog_MyButtonText"
78+
style="@style/MyButtonText"
7979
android:text="@string/ok"
8080
android:visibility="gone"
8181
tools:visibility="visible" />
8282

8383
<Button
8484
android:id="@+id/d_btn_cancel_MBO"
85-
style="@style/LibSearchViewDialog_MyButtonOutlined"
85+
style="@style/MyButtonOutlined"
8686
android:layout_marginEnd="@dimen/def_margin"
8787
android:text="@string/cancel"
8888
android:visibility="gone" />
8989

9090
<Button
9191
android:id="@+id/d_btn_ok_MBO"
92-
style="@style/LibSearchViewDialog_MyButtonOutlined"
92+
style="@style/MyButtonOutlined"
9393
android:text="@string/ok"
9494
android:visibility="gone" />
9595

9696
<Button
9797
android:id="@+id/d_btn_cancel_MBC"
98-
style="@style/LibSearchViewDialog_MyButtonContained"
98+
style="@style/MyButtonContained"
9999
android:layout_marginEnd="@dimen/def_margin"
100100
android:text="@string/cancel"
101101
android:visibility="gone" />
102102

103103
<Button
104104
android:id="@+id/d_btn_ok_MBC"
105-
style="@style/LibSearchViewDialog_MyButtonContained"
105+
style="@style/MyButtonContained"
106106
android:text="@string/ok"
107107
android:visibility="gone" />
108108

‎lib/src/main/res/values/styles.xml‎

Lines changed: 5 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,36 @@
11
<resources>
22
<!-- Base application theme. -->
3-
<style name="LibSearchViewDialog_AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
3+
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
44
<!-- Customize your theme here. -->
55
<item name="colorPrimary">@color/colorPrimary</item>
66
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
77
<item name="colorAccent">@color/colorAccent</item>
88
</style>
99

10-
<style name="LibSearchViewDialog_AppTheme2" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
10+
<style name="AppTheme2" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
1111
<!-- Customize your theme here. -->
1212
<item name="colorPrimary">@color/green_600</item>
1313
<item name="colorPrimaryDark">@color/deep_orange_700</item>
1414
<item name="colorAccent">@color/lime_A100</item>
1515
</style>
1616

17-
<style name="LibSearchViewDialog_DialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
17+
<style name="DialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
1818
<item name="android:windowMinWidthMajor">80%</item>
1919
<item name="android:windowMinWidthMinor">80%</item>
2020
</style>
2121

22-
<style name="LibSearchViewDialog_DialogStyle_In" parent="Theme.MaterialComponents.Light.Dialog">
22+
<style name="DialogStyle_In" parent="Theme.MaterialComponents.Light.Dialog">
2323
<item name="android:windowMinWidthMajor">80%</item>
2424
<item name="android:windowMinWidthMinor">80%</item>
2525
<item name="android:windowEnterAnimation">@anim/anim_in</item>
2626
<item name="android:windowExitAnimation">@anim/anim_out</item>
2727
</style>
2828

29-
<style name="LibSearchViewDialog_DialogStyle_Slide" parent="Theme.MaterialComponents.Light.Dialog">
29+
<style name="DialogStyle_Slide" parent="Theme.MaterialComponents.Light.Dialog">
3030
<item name="android:windowMinWidthMajor">80%</item>
3131
<item name="android:windowMinWidthMinor">80%</item>
3232
<item name="android:windowEnterAnimation">@anim/slide_up</item>
3333
<item name="android:windowExitAnimation">@anim/slide_down</item>
3434
</style>
3535

36-
<style name="LibSearchViewDialog_MyDivider">
37-
<item name="android:layout_width">match_parent</item>
38-
<item name="android:layout_height">1dp</item>
39-
<item name="android:layout_marginTop">@dimen/text_margin</item>
40-
<item name="android:background">@color/divider</item>
41-
</style>
42-
43-
<style name="LibSearchViewDialog_MyTextHeader">
44-
<item name="android:layout_width">wrap_content</item>
45-
<item name="android:layout_height">wrap_content</item>
46-
<item name="android:alpha">1</item>
47-
<item name="android:textStyle">bold</item>
48-
<item name="android:textColor">@color/text_header</item>
49-
<item name="android:textSize">@dimen/h3</item>
50-
<item name="android:layout_marginTop">@dimen/text_margin</item>
51-
</style>
52-
53-
<style name="LibSearchViewDialog_MyTextContent">
54-
<item name="android:layout_width">wrap_content</item>
55-
<item name="android:layout_height">wrap_content</item>
56-
<item name="android:alpha">1</item>
57-
<item name="android:textColor">@color/text_content</item>
58-
<item name="android:textSize">@dimen/h3</item>
59-
</style>
60-
61-
<style name="LibSearchViewDialog_MyButtonText" parent="Widget.MaterialComponents.Button.TextButton">
62-
<item name="android:layout_height">@dimen/button_height</item>
63-
<item name="android:layout_width">wrap_content</item>
64-
<item name="android:textColor">@color/colorPrimary</item>
65-
</style>
66-
67-
<style name="LibSearchViewDialog_MyButtonOutlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
68-
<item name="android:layout_height">@dimen/button_height</item>
69-
<item name="android:layout_width">wrap_content</item>
70-
</style>
71-
72-
<style name="LibSearchViewDialog_MyButtonContained">
73-
<item name="android:layout_height">@dimen/button_height</item>
74-
<item name="android:layout_width">wrap_content</item>
75-
</style>
76-
77-
<style name="LibSearchViewDialog_MyButtonIcon" parent="Widget.MaterialComponents.Button.Icon">
78-
<item name="android:layout_height">@dimen/button_height</item>
79-
<item name="android:layout_width">wrap_content</item>
80-
</style>
81-
82-
<style name="LibSearchViewDialog_MyTextInputLayoutOutlinedBox" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
83-
<item name="android:layout_width">match_parent</item>
84-
<item name="android:layout_height">wrap_content</item>
85-
<item name="android:layout_marginTop">@dimen/space_between_edittext</item>
86-
</style>
87-
88-
<style name="LibSearchViewDialog_MyTextInputEditText">
89-
<item name="android:layout_width">match_parent</item>
90-
<item name="android:layout_height">wrap_content</item>
91-
<item name="android:alpha">1</item>
92-
<item name="android:textColor">@color/text_content</item>
93-
<item name="android:textSize">@dimen/h3</item>
94-
</style>
95-
9636
</resources>

0 commit comments

Comments
 (0)