Merge remote-tracking branch 'origin/beta' into beta

Mahmud0808 · Sep 28, 2023 · ce4b786 · ce4b786
2 parents f4d643a + d885810
commit ce4b786
Show file tree

Hide file tree

Showing 6 changed files with 834 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -129,6 +129,7 @@ You can help translate Iconify [on Crowdin](https://crowdin.com/project/iconify)
 - French [@MXC48](https://github.com/MXC48)
 - Indonesian [@KaeruShi](https://github.com/KaeruShi)
 - Persian [@Faceless1999](https://github.com/Faceless1999)
+- Polish [@SK00RUPA](https://github.com/SK00RUPA)
 - Portuguese [@ElTifo](https://github.com/ElTifo)
 - Russian [@B1ays](https://github.com/B1ays)
 - Simplified Chinese [@Cccc-owo](https://github.com/Cccc-owo)

diff --git a/app/src/main/java/com/drdisagree/iconify/ui/activities/Credits.java b/app/src/main/java/com/drdisagree/iconify/ui/activities/Credits.java
@@ -82,6 +82,7 @@ private InfoAdapter initTranslatorsList() {
         translators_list.add(new InfoModel(this, "luckkmaxx", getResources().getString(R.string.es_translation), "https://github.com/luckkmaxx", R.drawable.ic_user));
         translators_list.add(new InfoModel(this, "Serhat Demir", getResources().getString(R.string.tr_translation), "https://github.com/serhat-demir", R.drawable.ic_user));
         translators_list.add(new InfoModel(this, "Đức Trọng", getResources().getString(R.string.vi_translation), "https://t.me/viettel1211", R.drawable.ic_user));
+        translators_list.add(new InfoModel(this, "Jakub Skorłutowski", getResources().getString(R.string.pl_translation), "https://github.com/SK00RUPA", R.drawable.ic_user));
 
         return new InfoAdapter(this, translators_list);
     }

diff --git a/app/src/main/res/layout/activity_xposed_lockscreen_clock.xml b/app/src/main/res/layout/activity_xposed_lockscreen_clock.xml
@@ -77,7 +77,7 @@
                     style="@style/TextAppearance.Material3.TitleMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/header_clock_style_title"
+                    android:text="@string/custom_lockscreen_clock_style_title"
                     android:textColor="@color/text_color_primary" />
 
                 <TextView
@@ -123,14 +123,14 @@
                     style="@style/TextAppearance.Material3.TitleMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/header_clock_font_title"
+                    android:text="@string/lockscreen_clock_font_title"
                     android:textColor="@color/text_color_primary" />
 
                 <TextView
                     style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/header_clock_font_desc"
+                    android:text="@string/lockscreen_clock_font_desc"
                     android:textColor="@color/text_color_secondary" />
 
                 <com.google.android.material.button.MaterialButton
@@ -183,14 +183,14 @@
                         style="@style/TextAppearance.Material3.TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/custom_header_clock_color_title"
+                        android:text="@string/lsclock_custom_color_title"
                         android:textColor="@color/text_color_primary" />
 
                     <TextView
                         style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/custom_header_clock_color_desc"
+                        android:text="@string/lsclock_custom_color_desc"
                         android:textColor="@color/text_color_secondary" />
 
                 </LinearLayout>
@@ -226,14 +226,14 @@
                         style="@style/TextAppearance.Material3.TitleMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/header_clock_color_picker_title"
+                        android:text="@string/lsclock_color_picker_title"
                         android:textColor="@color/text_color_primary" />
 
                     <TextView
                         style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/header_clock_color_picker_desc"
+                        android:text="@string/lsclock_color_picker_desc"
                         android:textColor="@color/text_color_secondary" />
 
                 </LinearLayout>
@@ -300,7 +300,7 @@
                     style="@style/TextAppearance.Material3.TitleMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/header_clock_font_text_scaling_title"
+                    android:text="@string/lockscreen_font_text_scaling_title"
                     android:textColor="@color/text_color_primary" />
 
                 <TextView