Merge branch 'dev'

Author: Yanndroid

README.md

@@ -18,6 +18,7 @@ Huge thanks to [BlackMesa123](https://github.com/BlackMesa123) who has contribut
 
 - [Screenshots](#Screenshots)
 - [Installation](#Installation)
+- [Issues](#Issues)
 - [Documentation](#Documentation)
 - [Progress](#Progress)
 - [Changelog](#Changelog)
@@ -26,15 +27,16 @@ Huge thanks to [BlackMesa123](https://github.com/BlackMesa123) who has contribut
 
 ## Screenshots
 
-<img loading="lazy" src="readme-resources/screenshots/screenshot_1.png" width="150"/> <img loading="lazy" src="readme-resources/screenshots/screenshot_2.png" width="150"/> <img loading="lazy" src="readme-resources/screenshots/screenrecording.gif" width="150"/>
+<p align="center"><img loading="lazy" src="readme-resources/screenshots/screenshot_1.jpg" height="350"/> <img loading="lazy" src="readme-resources/screenshots/screenshot_2.jpg" height="350"/> <img loading="lazy" src="readme-resources/screenshots/screenshot_3.jpg" height="350"/> <img loading="lazy" src="readme-resources/screenshots/screenshot_4.jpg" height="350"/></p>
+
+[GIF version](https://github.com/Yanndroid/OneUI-Design-Library/blob/master/readme-resources/screenshots/screenrecording.gif)
 
 ## Installation
-v2.0.0 and future versions are (and only will be) available on mavenCentral. For older ones see below. (v1.3.0 was published to MavenCentral during development for testing purpose and should **not** be used as it's unstable and incomplete.)
 
 1. Add the dependency to build.gradle (Module: ...)
 ```gradle
 dependencies {
-    implementation 'io.github.yanndroid:oneui:2.2.0'
+    implementation 'io.github.yanndroid:oneui:2.2.1'
     ...
 }
 ```
@@ -74,73 +76,18 @@ res/values-v25/styles.xml
 
 </details>
 
+## Issues
 
-<details>
-<summary>Older versions</summary>
+### Proguard
 
-### with [Jitpack](https://jitpack.io/#Yanndroid/SamsungOneUi):
-1. Add jitpack to build.gradle (Project: ...)
-```gradle
-allprojects {
-    repositories {
-        ...
-        maven { url 'https://jitpack.io' }
-	}
-}
-```
-2. Add the dependency to build.gradle (Module: ...)
-```gradle
-dependencies {
-    implementation 'com.github.Yanndroid:OneUI-Design-Library:1.3.0'
-    ...
-}
-```
-3. Apply the main theme in AndroidManifest.xml
-```xml
-<application
-    ...
-    android:theme="@style/SamsungTheme"
-    >
-    ...
-</application>
-```
-
-
-### with Github Packages:
-1. Create a [new token](https://github.com/settings/tokens) with ```read:packages``` permission.
-2. Add the dependency to build.gradle (Module: ...)
-```gradle
-repositories {
-    maven {
-        url = uri("https://maven.pkg.github.com/Yanndroid/OneUI-Design-Library")
-            credentials {
-                username = "your username"
-                password = "your token"
-            }
-    }
-}
-
-
-dependencies {
-    implementation 'de.dlyt.yanndroid:oneui:1.3.0'
-    ...
-}
-```
+If you encounter problems with Proguard (missing classes), see this [Issue](https://github.com/Yanndroid/OneUI-Design-Library/issues/53) by [AlirezaIvaz](https://github.com/AlirezaIvaz).
 
-3. Apply the main theme in AndroidManifest.xml
+### Preview render problem
+Some of the custom views might not render in the preview, because this library is using a font (```sec-roboto-light```), which Android Studio (and other IDEs probably too) don't know. To temporarily bypass this problem you can simply add 
 ```xml
-<application
-    ...
-    android:theme="@style/SamsungTheme"
-    >
-    ...
-</application>
+<string name="sesl_font_family_regular">sans-serif</string>
 ```
-
-</details>
-<br/>
-
-If you encounter problems with Proguard (missing classes), see this [Issue](https://github.com/Yanndroid/OneUI-Design-Library/issues/53) by [AlirezaIvaz](https://github.com/AlirezaIvaz).
+to your strings.xml. But don't forget to remove it afterwards for your release. Thanks to [roynatech2544](https://github.com/roynatech2544), for reporting this issue.
 
 ## Documentation
 In general, most of the views are styled automatically when you apply ```android:theme="@style/OneUITheme"``` in AndroidManifest.xml, the usage of the custom views in the library however is needed to achieve the best results.
@@ -269,7 +216,7 @@ For further customization you can use ```android:layout``` to apply your own lay
 <br clear="left"/>
 
 #### Methods
-Return the toolbar, useful for ```setSupportActionBar()```.
+Return the Toolbar.
 ```java
 public MaterialToolbar getToolbar()
 ```
@@ -481,6 +428,10 @@ For further customization you can use ```android:layout``` to apply your own lay
 <br clear="left"/>
 
 #### Methods
+Return the [ToolbarLayout](#ToolbarLayout).
+```java
+public ToolbarLayout getToolbarLayout()
+```
 Return the [SwitchBar](#SwitchBar).
 ```java
 public SwitchBar getSwitchBar()
@@ -582,6 +533,10 @@ public void seslSetFillBottomColor(int color)
 Samsung also customized RecyclerView.ItemDecoration class by adding a call to **onDispatchDraw** method of the View. Overriding the ```seslOnDispatchDraw``` method lets you customize even more your list/grid view. You can find an example of it [here](https://github.com/Yanndroid/OneUI-Design-Library/blob/1e110958151a93647b71b80c68e54949a3a0691a/app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/IconsTab.java#L298).
 
 ### SwipeRefreshLayout
+Samsung's SwipeRefreshLayout.
+
+<img loading="lazy" src="readme-resources/screenshots/swiperefreshlayout.jpg" width="300"/>
+
 It's almost the same as Google's one, only difference is a different "pull-down" animation. 
 ```xml
 <de.dlyt.yanndroid.oneui.layout.SwipeRefreshLayout
@@ -592,6 +547,12 @@ It's almost the same as Google's one, only difference is a different "pull-down"
 ```
 Attributes and usage are the same as Google's [SwipeRefreshLayout](https://developer.android.com/reference/androidx/swiperefreshlayout/widget/SwipeRefreshLayout).
 
+#### Methods
+End the refresh status once the animation ends.
+```java
+public void seslSetRefreshOnce(boolean once)
+```
+
 ### Button
 The Button has three styles which you can use, depending on your needs.
 
@@ -811,7 +772,7 @@ public void setTitle(String title)
 ### BottomNavigationView
 Samsung's BottomNavigationView.
 
-<img loading="lazy" src="readme-resources/screenshots/bottomnavigationview.png" width="300"/>
+<img loading="lazy" src="readme-resources/screenshots/bottomnavigationview.jpg" width="300"/>
 
 ```xml
 <de.dlyt.yanndroid.oneui.view.BottomNavigationView
@@ -824,7 +785,7 @@ Samsung's BottomNavigationView.
 If you want to set it up with a ViewPager you'll have to use the [ViewPager](#ViewPager) bundled in the library, the usage is the same as Google's [TabLayout](https://developer.android.com/reference/com/google/android/material/tabs/TabLayout), but you'll have to call ```updateWidget(Activity activity)``` after you configured it.
 
 #### Methods
-Add a custom ImageButton (like in Samsung's Gallery).
+Add a custom ImageButton like in Samsung's Gallery (as seen in screenshot).
 ```java
 public void addTabCustomButton(Drawable icon, CustomButtonClickListener listener)
 ```
@@ -1082,26 +1043,49 @@ Samsung's Radio Preferences used in Light/Dark mode Settings and Resolution Sett
 
 
 ### PopupMenu
-<img loading="lazy" src="readme-resources/screenshots/popupmenu.png" width="150"/>
+Create a PopupWindow Menu with it's anchor.
+
+<img loading="lazy" src="readme-resources/screenshots/popupmenu.jpg" width="150"/>
 
-Create a PopupMenu with it's anchor.
 ```java
 //de.dlyt.yanndroid.oneui.menu.PopupMenu
 PopupMenu popupMenu = new PopupMenu(view);
 ```
+
+#### Methods
 Inflate a menu resource or a Menu (de.dlyt.yanndroid.oneui.menu.Menu).
 ```java
 public void inflate(@MenuRes int menuRes)
+public void inflate(@MenuRes int menuRes, CharSequence title)
 public void inflate(Menu menu)
+public void inflate(Menu menu, CharSequence title)
 ```
-Get the menu.
+Get the inflated menu.
 ```java
 public Menu getMenu()
 ```
 Set the menu item click and update listener.
 ```java
 public void setPopupMenuListener(PopupMenuListener listener)
 ```
+Show a divider between menu groups.
+```java
+public void setGroupDividerEnabled(boolean enabled)
+```
+Set a custom animation set.
+```xml
+<!-- styles.xml -->
+<style name="MenuPopupAnimStyle" parent="@android:style/Animation">
+    <item name="android:windowEnterAnimation">@anim/sesl_menu_popup_enter</item>
+    <item name="android:windowExitAnimation">@anim/sesl_menu_popup_exit</item>
+</style>
+
+<style name="BottomMenuPopupAnimStyle" parent="@android:style/Animation">
+...
+```
+```java
+public void setAnimationStyle(int animationStyle)
+```
 Show and dismiss the popup.
 ```java
 public void show()
@@ -1115,7 +1099,7 @@ Samsung's Tooltip.
 
 <img loading="lazy" src="readme-resources/screenshots/tooltip.png" width="100"/>
 
-Usage is the same as [TooltipCompat](https://developer.android.com/reference/androidx/appcompat/widget/TooltipCompat) but with additional methods. Please note this won't show up on default views and has to be added manually instead of using ```view.setTooltipText(text)```:
+Usage is the same as [TooltipCompat](https://developer.android.com/reference/androidx/appcompat/widget/TooltipCompat) but with additional methods. Please note this won't show up on default views and has to be added manually. Instead of using ```view.setTooltipText(text)```, use:
 ```java
 Tooltip.setTooltipText(view, text);
 SeslViewReflector.semSetHoverPopupType(view, 1 /* SemHoverPopupWindow.TYPE_TOOLTIP */);
@@ -1156,7 +1140,7 @@ There are also a lot of the stock icons you can find in Samsung apps included in
 
 <img loading="lazy" src="readme-resources/screenshots/icons.png" width="350"/>
 
-*not all icons are shown here because there are too much by now(229). They are all listed with the file name in the icon tab of the sample app.
+*not all icons are shown here because there are too much by now (230). They are all listed with their name in the Icons tab of the sample app.
 
 ### Color theme
 The default color of the style is the same blue as Samsung (see [Screenshots](#Screenshots)). But like Samsung has different colors for different apps, you too can use other colors which will apply on the entire App and even on the [App Icon](#App-Icon). In this library there are three different ways to do that and all three can be used simultaneously:
@@ -1274,6 +1258,15 @@ Starting with v2.1.0, the new OneUI 4 design is being added to this library and
 
 ## Changelog
 
+<details>
+<summary>2.2.1</summary>
+
+- OneUI4++ (views, colors, fonts, themes)
+- PopupMenu improvements
+- fixes & minor changes
+
+</details>
+
 <details>
 <summary>2.2.0</summary>
 
@@ -1427,4 +1420,4 @@ Starting with v2.1.0, the new OneUI 4 design is being added to this library and
 - [BlackMesa123](https://github.com/BlackMesa123) for a lot of OneUI stuff, more compatibility and his experience.
 - [TenSeventy7](https://github.com/TenSeventy7) for some stuff and help.
 - [leonbcode](https://github.com/leonbcode) for github actions, so this library is always up-to-date.
-- All the [Contributors](https://github.com/Yanndroid/OneUI-Design-Library/graphs/contributors) and Issue Reporters.
+- All the [Contributors](https://github.com/Yanndroid/OneUI-Design-Library/graphs/contributors) and Issue Reporters.

app/build.gradle

@@ -27,6 +27,26 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    project.gradle.addBuildListener(new BuildListener() {
+        @Override
+        void settingsEvaluated(Settings settings) {}
+
+        @Override
+        void projectsLoaded(Gradle gradle) {}
+
+        @Override
+        void projectsEvaluated(Gradle gradle) {
+            File stringFile = new File("${projectDir}/src/main/res/values/strings.xml")
+            stringFile.write(stringFile.getText('UTF-8').replace("<string name=\"sesl_font_family_regular\" translatable=\"false\">sans-serif</string>", "<string name=\"sesl_font_family_regular\" translatable=\"false\">sec-roboto-light</string>"), 'UTF-8')
+        }
+
+        @Override
+        void buildFinished(BuildResult result) {
+            File stringFile = new File("${projectDir}/src/main/res/values/strings.xml")
+            stringFile.write(stringFile.getText('UTF-8').replace("<string name=\"sesl_font_family_regular\" translatable=\"false\">sec-roboto-light</string>", "<string name=\"sesl_font_family_regular\" translatable=\"false\">sans-serif</string>"), 'UTF-8')
+        }
+    })
 }
 
 dependencies {

app/release/app-release.apk

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 55,
-      "versionName": "2.2.0",
+      "versionCode": 56,
+      "versionName": "2.2.1",
       "outputFile": "app-release.apk"
     }
   ],

app/release/output-metadata.json

@@ -2,18 +2,17 @@
 
 import android.os.Bundle;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.google.android.material.button.MaterialButton;
 
 import de.dlyt.yanndroid.oneui.layout.AboutPage;
-import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
+import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
 
-public class AboutActivity extends AppCompatActivity {
+public class AboutActivity extends BaseThemeActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        new ThemeUtil(this);
+        mUseAltTheme = true;
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);