Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 08caa56

Browse files
committed
- version 1.1.1
1 parent 7bfe955 commit 08caa56

File tree

9 files changed

+51
-8
lines changed

9 files changed

+51
-8
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
minSdkVersion 26
1212
targetSdkVersion 30
1313
versionCode 1
14-
versionName "1.1.0"
14+
versionName "1.1.1"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}

yanndroid/samsung/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ publishing {
1818
bar(MavenPublication) {
1919
groupId ='de.dlyt.yanndroid'
2020
artifactId = 'samsung'
21-
version = '1.1.0'
21+
version = '1.1.1'
2222
artifact("$buildDir/outputs/aar/samsung-release.aar")
2323
}
2424
}
@@ -32,7 +32,7 @@ android {
3232
minSdkVersion 26
3333
targetSdkVersion 30
3434
versionCode 1
35-
versionName "1.1.0"
35+
versionName "1.1.1"
3636

3737
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3838
consumerProguardFiles "consumer-rules.pro"

yanndroid/samsung/src/main/java/de/dlyt/yanndroid/samsung/layout/DrawerLayout.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ public class DrawerLayout extends LinearLayout {
5353
private int viewIdForDrawer;
5454

5555

56+
private androidx.drawerlayout.widget.DrawerLayout drawerLayout;
57+
private View drawer;
58+
59+
5660
public DrawerLayout(Context context, @Nullable AttributeSet attrs) {
5761
super(context, attrs);
5862
TypedArray attr = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DrawerLayout, 0, 0);
@@ -85,8 +89,8 @@ public DrawerLayout(Context context, @Nullable AttributeSet attrs) {
8589

8690
/*drawer logic*/
8791
View content = findViewById(R.id.main_content);
88-
androidx.drawerlayout.widget.DrawerLayout drawerLayout = findViewById(R.id.drawerLayout);
89-
View drawer = findViewById(R.id.drawer);
92+
drawerLayout = findViewById(R.id.drawerLayout);
93+
drawer = findViewById(R.id.drawer);
9094

9195
ViewGroup.LayoutParams layoutParams = drawer.getLayoutParams();
9296
layoutParams.width = (int) ((double) this.getResources().getDisplayMetrics().widthPixels / 1.19);
@@ -145,6 +149,15 @@ public void showIconNotification(boolean navigationIcon, boolean drawerIcon) {
145149
drawerIcon_badge.setVisibility(drawerIcon ? VISIBLE : GONE);
146150
}
147151

152+
public void setDrawerOpen(Boolean open, Boolean animate) {
153+
if (open){
154+
drawerLayout.openDrawer(drawer, animate);
155+
}else {
156+
drawerLayout.closeDrawer(drawer, animate);
157+
}
158+
159+
}
160+
148161

149162
private Activity getActivity() {
150163
Context context = getContext();
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:alpha="0.4" android:color="@color/sesl_control_activated_color" android:state_enabled="false" />
4+
<item android:color="@color/sesl_control_activated_color" />
5+
</selector>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:color="?colorControlActivated" android:state_checked="true" />
4+
<item android:color="?colorControlNormal" android:state_checked="false" />
5+
</selector>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<solid android:color="@color/item_background_color" />
5+
<corners
6+
android:bottomLeftRadius="24.0dip"
7+
android:bottomRightRadius="0dp"
8+
android:radius="24dp"
9+
android:topLeftRadius="24.0dip"
10+
android:topRightRadius="0dp" />
11+
</shape>

yanndroid/samsung/src/main/res/layout/samsung_toolbarlayout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<LinearLayout
133133
android:id="@+id/main_container"
134134
android:layout_width="match_parent"
135-
android:layout_height="wrap_content"
135+
android:layout_height="match_parent"
136136
android:orientation="vertical">
137137

138138
<!--Main Content-->

yanndroid/samsung/src/main/res/values/colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<color name="secondary_color">#ff3e91ff</color> <!--color_control_activated-->
77
<color name="primary_dark_color">#ff0072de</color> <!--color_primary_dark-->
88

9-
<color name="accent_material">@color/material_deep_teal_500</color>
9+
<color name="accent_material">@color/sesl_secondary_color</color>
1010
<color name="sesl_background_floating">@color/sesl_white</color>
1111
<color name="sesl_ripple_color">#1a000000</color>
1212
<color name="sesl_error_color">#fff4511e</color>

yanndroid/samsung/src/main/res/values/styles.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,16 @@
124124
<item name="cornerRadius">26dp</item>
125125
<item name="android:textSize">16sp</item>
126126
<item name="android:textColor">@color/sesl_control_activated_color</item>
127+
<item name="fontFamily">sec-roboto-light</item>
127128
</style>
128129

129130
<style name="ButtonStyle.Invert">
130-
<item name="android:backgroundTint">@color/sesl_control_activated_color</item>
131+
<item name="android:backgroundTint">@color/sesl_btn_color_state</item>
131132
<item name="android:textColor">@color/white</item>
132133
</style>
133134

134135
<style name="ButtonStyle.Invert.Secondary">
136+
<item name="rippleColor">@color/item_color</item>
135137
<item name="android:backgroundTint">@color/button_background_color</item>
136138
<item name="android:textColor">@color/item_color</item>
137139
</style>
@@ -147,6 +149,13 @@
147149
<item name="android:button">@drawable/sesl_btn_radio</item>
148150
</style>
149151

152+
<style name="RadioButtonStyle.Vertical">
153+
<item name="android:button">@null</item>
154+
<item name="android:gravity">center</item>
155+
<item name="android:drawableBottom">@drawable/sesl_btn_radio</item>
156+
<item name="android:textColor">@color/sesl_radiobutton_text_color</item>
157+
</style>
158+
150159

151160
<!--Drawer-->
152161
<style name="DrawerStyle">

0 commit comments

Comments
 (0)