Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[do not merge] App foundations primary issue #1

Merged
merged 156 commits into from
Aug 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
6633f9b
add basic empty Activity app
mzorz Jul 19, 2019
948255a
Add navigation between MainActivity and ComposeLoopFrameActivity
mzorz Jul 19, 2019
0498594
just setting default enter/out animation
mzorz Jul 19, 2019
778466b
removed unused code, added up navigation between main and Composer ac…
mzorz Jul 19, 2019
d0edd33
renamed package from com.automattic.loop to com.automattic.portkey to…
mzorz Jul 19, 2019
39ae71f
changed name
mzorz Jul 20, 2019
cd295db
Merge pull request #3 from Automattic/app/foundation-package-rename
aforcier Jul 22, 2019
bdde29a
Update .idea files
aforcier Jul 19, 2019
48bb174
Add fetchstyle plugin and fetch configs
aforcier Jul 19, 2019
f502716
Add checkstyle configuration
aforcier Jul 19, 2019
1447a34
Add ktlint configuration
aforcier Jul 19, 2019
736b575
Fix checkstyle and ktlint violations
aforcier Jul 19, 2019
7c695e8
Update kotlin and gradle plugin versions
aforcier Jul 19, 2019
335c886
Add code style section to README
aforcier Jul 19, 2019
c5d0e47
Merge pull request #4 from Automattic/set-up-linting
mzorz Jul 22, 2019
9524a36
Add CircleCI config file
aforcier Jul 22, 2019
8d9b64d
fixed merge conflict
mzorz Jul 22, 2019
9f98436
fixed checkstyle warnings
mzorz Jul 22, 2019
62a964e
fixed parentActivityName
mzorz Jul 22, 2019
bced658
Merge pull request #5 from Automattic/circleci
mzorz Jul 22, 2019
e51d0c7
Merge branch 'app/foundation' into app/foundation-navigation
mzorz Jul 22, 2019
1a484c1
raw add of photoeditor module
mzorz Jul 29, 2019
d0bbdbd
removed GlGifWatermarkFilter.kt from photoeditor lib, will re-add lat…
mzorz Jul 29, 2019
c626fc6
fixed Dialog imports and parent class
mzorz Jul 29, 2019
05cc96b
set correct imports, addressed some ktlint warnings in Camera2BasicHa…
mzorz Jul 29, 2019
f4512b9
fixed lint warnings
mzorz Jul 29, 2019
fd6e881
fixed some ktlint warnings, removed onClick listener for VideoPlaying…
mzorz Jul 29, 2019
6817270
delete empty lines, added ToDo to check granular video listener imple…
mzorz Jul 29, 2019
72bf842
fixed imports and ktlint warnings for BrushDrawingView
mzorz Jul 29, 2019
043f65c
fixed lint warnings, added Glide library to photoeditor
mzorz Jul 29, 2019
1848b2f
fix ktlint warnings
mzorz Jul 29, 2019
c504456
fixed style
mzorz Jul 29, 2019
d454e3a
removed extra lines
mzorz Jul 29, 2019
7a3ec10
removed extra lines
mzorz Jul 29, 2019
14e9108
fixed ktlint violations
mzorz Jul 29, 2019
cc201e0
fixed static import
mzorz Jul 29, 2019
9346f8e
removed unused ViewType
mzorz Jul 29, 2019
964aa8c
added test buttons to test module
mzorz Jul 30, 2019
f36258d
moved actions to options menu to allow space for the interface
mzorz Jul 30, 2019
a5c2519
photoEditor now linked to main module and instantiated in main activity
mzorz Jul 30, 2019
aaa437e
added tool selection on overflow options menu
mzorz Jul 30, 2019
b0d1f44
added random emoji testing
mzorz Jul 30, 2019
cab4a9c
changed text color
mzorz Jul 30, 2019
3bfa17d
added sticker test
mzorz Jul 30, 2019
716c512
Merge pull request #2 from Automattic/app/foundation-navigation
mzorz Jul 30, 2019
152a0ed
fixed merge conflicts and moved PhotoEditor glueing code to ComposeLo…
mzorz Jul 30, 2019
00d4805
fixed checkstyle issue
mzorz Jul 30, 2019
120df9c
renamed FilterImageView for less ambiguous BackgroundImageView
mzorz Jul 31, 2019
c563385
organised files in packages
mzorz Jul 31, 2019
a70d28c
renamed imgSource to more proper BackgroundImageView
mzorz Jul 31, 2019
7c4f4b4
removed unnecessary private local val
mzorz Jul 31, 2019
668ac1d
grouped dependencies
mzorz Jul 31, 2019
92654d2
added LICENSE file
mzorz Aug 1, 2019
24e645e
added dialog to make text editing possible
mzorz Aug 1, 2019
b91291c
Merge branch 'app/foundation-photo-editor-lib-module' into app/founda…
mzorz Aug 1, 2019
e0b7035
Merge pull request #6 from Automattic/app/foundation-photo-editor-lib…
aforcier Aug 1, 2019
b0776d3
fixed import
mzorz Aug 1, 2019
a943aa8
introducing BackgroundSurfaceManager to observe the host Activity lif…
mzorz Aug 1, 2019
c37b0d0
moved saving instance state to/from Bundle insteaf of shared prefs
mzorz Aug 2, 2019
3c46121
added methods for switchin video, camera preview, or static image bac…
mzorz Aug 2, 2019
852b3a4
fixed checkstyle issues
mzorz Aug 2, 2019
f7b3e00
removed permission callback from VideoPlayingBasicHandling as it was …
mzorz Aug 2, 2019
c9ebccb
added test options to switch between camera preview, static backgroun…
mzorz Aug 2, 2019
694dd83
left video recording status handling as TODO
mzorz Aug 2, 2019
94fffc4
renamed request code to better reflect its general purpose
mzorz Aug 2, 2019
3233472
fixed style
mzorz Aug 2, 2019
0708d3c
Merge pull request #11 from Automattic/app/foundation-photo-editor-re…
aforcier Aug 2, 2019
52f8c96
adding used permissions and tying permission handling from ComposeLoo…
mzorz Aug 2, 2019
aa58b09
ask for all needed permissions up front when they want to start recor…
mzorz Aug 2, 2019
62ffeef
removed unused import
mzorz Aug 2, 2019
0e20e03
no need to add a dialog here - we will keep asking for permissions be…
mzorz Aug 2, 2019
b98a06b
fixed style issues
mzorz Aug 2, 2019
c43a742
added mp4composer lib as a module
mzorz Aug 2, 2019
156a596
added GlGifWatermarkFilter to sync GIF on top of video
mzorz Aug 2, 2019
1d91e81
added mp4composer as a dependency in PhotoEditor
mzorz Aug 2, 2019
df05539
adding video saving methods back
mzorz Aug 2, 2019
b3c8791
fixed style issues
mzorz Aug 2, 2019
a73c754
converted mp4composer java files to kotlin + fixed ktlint violations
mzorz Aug 5, 2019
f64c8c8
fixed most kotlin type violations
mzorz Aug 5, 2019
39478cd
fixed fillModeCustomItem nullability
mzorz Aug 6, 2019
4507059
removed JvmStatic decl on protected members to avoid java.lang.Illega…
mzorz Aug 6, 2019
141f267
augmented onCancel() interface method to handle special case when use…
mzorz Aug 6, 2019
d1738e9
fixed ktlint and checkstyle issues
mzorz Aug 6, 2019
c7ae505
simplified permission handling a bit, now BackgroundSurfaceManager do…
mzorz Aug 9, 2019
c4d56ed
added gradle properties handling to select Camera2 or CameraX impleme…
mzorz Aug 9, 2019
a2673b6
introduce CameraXBasicHandling fragment, simplified fragment instanti…
mzorz Aug 9, 2019
49286a8
added CameraX implementation, separated concerns for VideoRecorder an…
mzorz Aug 9, 2019
ff17c99
made VideoRecorderFragment contain the minimum needed surface and fil…
mzorz Aug 9, 2019
2e4b24d
removed commented code
mzorz Aug 9, 2019
30c248e
fixed style issue
mzorz Aug 9, 2019
14dee59
removed comment
mzorz Aug 9, 2019
9358e8b
fixed style issues
mzorz Aug 9, 2019
8cdd629
only attempt to deactivate if already active
mzorz Aug 10, 2019
4944f99
fixed switching to video player mode after recording video from camer…
mzorz Aug 10, 2019
4717eb0
added safeguard code to re-create TextureView after using CameraX
mzorz Aug 10, 2019
48d924c
added target aspect ratio and rotation plus lens facing to preview co…
mzorz Aug 12, 2019
bfe41cc
added image capture use case
mzorz Aug 12, 2019
a8d181d
implemented ImageCaptureHandler interface and takePicture action
mzorz Aug 12, 2019
3fdbe73
changed deprecated compile directive in favor of implementation direc…
mzorz Aug 12, 2019
e5ced1c
Merge pull request #21 from Automattic/app/foundation-add-mp4composer…
aforcier Aug 12, 2019
d367fe8
Merge pull request #18 from Automattic/app/foundation-add-mp4composer
aforcier Aug 12, 2019
64bc715
added ImageCaptureListener to listen for still image capture results
mzorz Aug 12, 2019
9aa60bc
added option to test still image capture
mzorz Aug 12, 2019
ca6caa7
fixed style issues
mzorz Aug 13, 2019
e3824b4
changed static images from PNG to JPG
mzorz Aug 13, 2019
cd781cf
changed sourceBitmap to nullable param type
mzorz Aug 13, 2019
eb302c5
loading captured image file into background view with Glide
mzorz Aug 13, 2019
536ff67
calling new use case ImageCapture's clear() in windDown()
mzorz Aug 13, 2019
0fb7db8
removed unused code
mzorz Aug 13, 2019
e3fb975
make sure to run takePicture callback code on UI thread
mzorz Aug 13, 2019
d59bcf8
added takePicture functionality to Camera2BasicHandling
mzorz Aug 13, 2019
506451d
calling startUp in surfaceAvailableListener to make background thread…
mzorz Aug 13, 2019
be97adf
removed unused import
mzorz Aug 13, 2019
258557f
removed unused parameter
mzorz Aug 13, 2019
3c49776
removed unused parameter
mzorz Aug 13, 2019
fe7ee0d
removed unused Dialog
mzorz Aug 13, 2019
16d9a41
get rid of force unwrap
mzorz Aug 13, 2019
da2e480
removed return statement
mzorz Aug 13, 2019
20033ac
added needed default return statement
mzorz Aug 13, 2019
e2fe8ee
removed onRequestPermissionsResult handling in fragment
mzorz Aug 13, 2019
2f4c6aa
fixed merge conflicts
mzorz Aug 13, 2019
3f0ad4b
Merge branch 'app/foundation' into app/foundation-permissions-refactor
mzorz Aug 13, 2019
78054d2
Merge branch 'app/foundation-permissions-refactor' into app/foundatio…
mzorz Aug 13, 2019
75a49ee
Merge branch 'app/foundation-camerax' into issue/24-rebuild-surface-a…
mzorz Aug 13, 2019
ff749ed
fixed merge conflicts
mzorz Aug 13, 2019
bf3b76a
fixed indentation
mzorz Aug 13, 2019
4793c83
Untrack and ignore gradle.properties
aforcier Aug 13, 2019
1bc2fec
Add gradle.properties-example file
aforcier Aug 13, 2019
b49739d
Generate gradle.properties file on CircleCI
aforcier Aug 13, 2019
26767fc
removed unused defs
mzorz Aug 13, 2019
e0f25fa
kotlinified expression plus removed commented code
mzorz Aug 13, 2019
bbcf4df
removed onRequestPermissionsResult handling in fragment
mzorz Aug 13, 2019
733f9d4
fixed return when statement
mzorz Aug 13, 2019
c1b239e
removed unnecessary null unwrap
mzorz Aug 13, 2019
9bf8692
Merge pull request #22 from Automattic/app/foundation-permissions-ref…
aforcier Aug 13, 2019
447461f
Merge pull request #23 from Automattic/app/foundation-camerax
aforcier Aug 14, 2019
2937e09
no need to re-create TextureView, just removng and adding it back to …
mzorz Aug 14, 2019
68d7554
removed blank line
mzorz Aug 14, 2019
e526c6a
remoed unneeded RelativeLayout references, and wrong ViewGroup refere…
mzorz Aug 14, 2019
94f6457
cleand up layout params declarations
mzorz Aug 14, 2019
c97e5bd
some more kotlin cleanup, and renamed variable to avoid ambiguity
mzorz Aug 14, 2019
925e42f
removed unneeded Runnable declaration
mzorz Aug 14, 2019
593e329
Merge pull request #28 from Automattic/issue/27-gradle-properties-update
mzorz Aug 14, 2019
a92c631
Merge branch 'app/foundation' into issue/24-rebuild-surface-after-cam…
mzorz Aug 14, 2019
6d9113e
fixed merge conflicts
mzorz Aug 14, 2019
281ff3c
Add app signing configurations to gradle build
aforcier Aug 14, 2019
178217c
Merge pull request #31 from Automattic/feature/app-signing-config
mzorz Aug 14, 2019
a1c164d
removed unused parameter, made method private
mzorz Aug 14, 2019
38b2c95
Merge pull request #25 from Automattic/issue/24-rebuild-surface-after…
aforcier Aug 14, 2019
f0ac4f3
dropped nullable and nonnull annotations - THIS IS KOTLIN FOR GOD's SAKE
mzorz Aug 15, 2019
40d282c
removed let{} wrapper on non-nullable var
mzorz Aug 15, 2019
8b4a9d2
renamed parameter and var to avoid future naming problems
mzorz Aug 15, 2019
3017eaf
avoid crash for potential null message
mzorz Aug 15, 2019
aae8bb3
removed parentheses
mzorz Aug 15, 2019
d4bfa92
removed unused import
mzorz Aug 15, 2019
93d9c18
Merge pull request #26 from Automattic/issue/foundation-camerax-still…
aforcier Aug 15, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
version: 2.1

orbs:
android: wordpress-mobile/[email protected]
slack: circleci/[email protected]

commands:
copy-gradle-properties:
steps:
- run:
name: Setup gradle.properties
command: cp gradle.properties-example gradle.properties

jobs:
Lint:
executor:
name: android/default
api-version: "29"
steps:
- checkout
- android/restore-gradle-cache
- copy-gradle-properties
- run:
name: Check Style
command: ./gradlew --stacktrace checkstyle ktlint
- run:
name: Lint
command: |
./gradlew --stacktrace lintRelease || (grep -A20 -B2 'severity="Error"' */build/**/*.xml; exit 1);
- android/save-gradle-cache
- android/save-lint-results
Unit Tests:
executor:
name: android/default
api-version: "29"
steps:
- checkout
- android/restore-gradle-cache
- copy-gradle-properties
- run:
name: Unit tests
command: ./gradlew --stacktrace -PtestsMaxHeapSize=1536m testRelease
- android/save-gradle-cache
- android/save-test-results

workflows:
portkey:
jobs:
- Lint
- Unit Tests
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[*.{kt,kts}]
max_line_length=120
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# OS X generated file
.DS_Store

# Built application files
*.apk
*.ap_
Expand All @@ -16,6 +19,7 @@ out/
# Gradle files
.gradle/
build/
gradle.properties

# Local configuration file (sdk path, etc)
local.properties
Expand Down
18 changes: 18 additions & 0 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

250 changes: 250 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/externalDependencies.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading