diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..4bec4ea
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+ ^$
+
+
+
+
+
+
+
+
+ style
+ ^$
+
+
+
+
+
+
+
+
+ .*
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index ff28a69..f6d4670 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 710d5df..cdb84b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
All major and minor version changes will be documented in this file. Details of
patch-level version changes can be found in [commit messages](../../commits/master).
+
+## 20210714 - 2021/07/14
+- Added link to online tutorial (on GitHub)
+- Ignore the compat sticker when creating groups
+- SVG back arrow
+- Add headings to UI
+- Removed unnecessary permissions
+
+
## 20210612 - 2021/06/12
- Changes from upstream:
- Merged `ui-update`, `feature_distributed_apks`, `fallback`. Providing a fresher
diff --git a/app/build.gradle b/app/build.gradle
index a5e195d..0382dfb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
applicationId "com.fredhappyface.ewesticker"
minSdkVersion 28
targetSdkVersion 30
- versionCode 20210623
- versionName "2021.06.23"
+ versionCode 20210714
+ versionName "2021.07.17"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b10c0aa..2c758cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,50 +1,47 @@
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.fredhappyface.ewesticker">
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left.xml
index 08bf114..7090e76 100644
--- a/app/src/main/res/drawable/ic_chevron_left.xml
+++ b/app/src/main/res/drawable/ic_chevron_left.xml
@@ -1,10 +1,10 @@
-
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c69ad0b..aed7390 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,194 +1,192 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/image_container_column.xml b/app/src/main/res/layout/image_container_column.xml
index a5788a1..c8d7a3f 100644
--- a/app/src/main/res/layout/image_container_column.xml
+++ b/app/src/main/res/layout/image_container_column.xml
@@ -1,7 +1,7 @@
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/bg"
+ tools:context="com.fredhappyface.ewesticker.ImageKeyboard">
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/pack_card.xml b/app/src/main/res/layout/pack_card.xml
index 6176b30..c4dd99a 100644
--- a/app/src/main/res/layout/pack_card.xml
+++ b/app/src/main/res/layout/pack_card.xml
@@ -1,20 +1,20 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:layout_marginHorizontal="8dp"
+ app:cardCornerRadius="0dp"
+ app:cardUseCompatPadding="true">
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/sticker_card.xml b/app/src/main/res/layout/sticker_card.xml
index 4956b3d..fd68464 100644
--- a/app/src/main/res/layout/sticker_card.xml
+++ b/app/src/main/res/layout/sticker_card.xml
@@ -1,20 +1,20 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:cardCornerRadius="8dp"
+ app:cardUseCompatPadding="true">
-
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09b..57a8801 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index f97a9bc..dda7e97 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-
- #212121
- #e0e0e0
- #323232
+
+ #212121
+ #e0e0e0
+ #323232
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0a0d8e5..9e4d7dc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
- #00796B
- #00695C
- #e0e0e0
+ #00796B
+ #00695C
+ #e0e0e0
\ No newline at end of file
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 24b68d5..ead51e1 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -1,9 +1,9 @@
- 32sp
- 18sp
- 16sp
- 8sp
- 6sp
- 0sp
+ 32sp
+ 18sp
+ 16sp
+ 8sp
+ 6sp
+ 0sp
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 68dad0e..39249d6 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #00796B
+ #00796B
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd00745..424d723 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,24 +1,24 @@
-
- EweSticker
- Pack icon
- Sticker icon
-
-
- Actions
- Choose a new sticker source directory
- Current loaded sticker information:
-
-
- Options
- Show back button in navbar?
- Disable Animations?
- "Icons per row: "
- "Icon size: "
-
-
- About
- "Sticker-board for android inspired by uSticker (forked from woosticker).
+
+ EweSticker
+ Pack icon
+ Sticker icon
+
+
+ Actions
+ Choose a new sticker source directory
+ Current loaded sticker information:
+
+
+ Options
+ Show back button in navbar?
+ Disable Animations?
+ "Icons per row: "
+ "Icon size: "
+
+
+ About
+ "Sticker-board for android inspired by uSticker (forked from woosticker).
## Features
@@ -30,8 +30,8 @@
(See https://github.com/FredHappyface/Android.EweSticker/blob/main/LICENSE.md for more information.)"
- Select a directory containing stickers and send them in your favourite apps! See https://github.com/FredHappyface/Android.EweSticker/blob/main/TUTORIAL.md for more information on how to use this app.
- MIT License Copyright © FredHappyface Copyright © Randy Zhou (See https://github.com/FredHappyface/Android.EweSticker/blob/main/LICENSE.md for more information.)
+ Select a directory containing stickers and send them in your favourite apps! See https://github.com/FredHappyface/Android.EweSticker/blob/main/TUTORIAL.md for more information on how to use this app.
+ MIT License Copyright © FredHappyface Copyright © Randy Zhou (See https://github.com/FredHappyface/Android.EweSticker/blob/main/LICENSE.md for more information.)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6e0d0ce..983eaee 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,72 +1,72 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cb6f252..2f69aa2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
-
- #fafafa
- #424242
- #e0e0e0
+
+ #fafafa
+ #424242
+ #e0e0e0
\ No newline at end of file
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
index f17e22e..b1967f6 100644
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -1,6 +1,6 @@
-
\ No newline at end of file
diff --git a/metadata/en-US/changelogs/20210612.txt b/metadata/en-US/changelogs/20210612.txt
index f9884e8..ffb2172 100644
--- a/metadata/en-US/changelogs/20210612.txt
+++ b/metadata/en-US/changelogs/20210612.txt
@@ -1,10 +1,13 @@
-## 20210612 - 2021/06/12
-- Changes from upstream:
- - Merged `ui-update`, `feature_distributed_apks`, `fallback`. Providing a fresher
- ui and the ability to send a fallback sticker for unsupported formats.
- - Converted to Kotlin
- - Provided fastlane metadata for fdroid
- - Provided tutorial (TUTORIAL.md)
- - Cleaned up assets and codebase
- - Changed package name to `com.fredhappyface.ewesticker`
- - Changed app icon
+
+Changes from upstream:
+
+ Merged `ui-update`, `feature_distributed_apks`, `fallback`. Providing a fresher
+ ui and the ability to send a fallback sticker for unsupported formats.
+ Converted to Kotlin
+ Provided fastlane metadata for fdroid
+ Provided tutorial (TUTORIAL.md)
+ Cleaned up assets and codebase
+ Changed package name to `com.fredhappyface.ewesticker`
+ Changed app icon
+
+
diff --git a/metadata/en-US/changelogs/20210714.txt b/metadata/en-US/changelogs/20210714.txt
new file mode 100644
index 0000000..c2f3839
--- /dev/null
+++ b/metadata/en-US/changelogs/20210714.txt
@@ -0,0 +1,7 @@
+
+Added link to online tutorial (on GitHub)
+Ignore the compat sticker when creating groups
+SVG back arrow
+Add headings to UI
+Removed unnecessary permissions
+
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
index c24407b..579aac2 100644
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@@ -1,9 +1,11 @@
Sticker-board for android inspired by uSticker (forked from woosticker).
-## Features
+Features
-- Add a directory containing stickers
- - Supported formats include .png, .gif, .jpg, .apng ,.webp
-- Select the keyboard
-- Send stickers in supported apps (.png is used as a fallback)
-- Ties in with the system theme
\ No newline at end of file
+
+Add a directory containing stickers
+Supported formats include .png, .gif, .jpg, .apng ,.webp Select the keyboard
+Send stickers in supported apps (.png is used as a fallback)
+Ties in with the system theme
+