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

Aayushi tiwari/host exception python editor #309

Open
wants to merge 118 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
0d5224c
Basic setup for hyper navigation
rahulraghuwanshii Dec 10, 2022
1c44a51
Create flow for hyper.
rahulraghuwanshii Dec 13, 2022
bfb6f7e
1. open HyperModule
rahulraghuwanshii Dec 15, 2022
fa27cb5
1. dependencies added for hyper
rahulraghuwanshii Dec 16, 2022
76ee57a
1. dependencies added for hyper
rahulraghuwanshii Dec 16, 2022
0ca8127
1. Extension package added.
rahulraghuwanshii Jan 8, 2023
a0111d2
1. Fix dependencies issue.
rahulraghuwanshii Jan 8, 2023
3eb0664
remove home tab
Dhan-shri Jan 9, 2023
3f7b79d
1. all code move to here.
rahulraghuwanshii Jan 9, 2023
b3c986a
1. basic code setup.
rahulraghuwanshii Jan 12, 2023
f224c05
1. basic code setup.
rahulraghuwanshii Jan 12, 2023
b67b90f
1. fix html run.
rahulraghuwanshii Jan 12, 2023
0d6a052
1. always dark mode.
rahulraghuwanshii Jan 12, 2023
08df19b
1. improve icon.
rahulraghuwanshii Jan 13, 2023
67059d1
1. fix file save issue
rahulraghuwanshii Jan 13, 2023
9f90e73
1. fix file save issue
rahulraghuwanshii Jan 13, 2023
ba2f7a3
crash sorted
maheshpandey04 Jan 16, 2023
edd7be2
1. fixes for internal release.
rahulraghuwanshii Jan 16, 2023
4608731
1. fixes for internal release.
rahulraghuwanshii Jan 17, 2023
849a101
1. fixes for internal release.
rahulraghuwanshii Jan 17, 2023
0bc67e3
removing chat on navigation
Dhan-shri Jan 17, 2023
6ddfa74
1. PlaygroundFragment.kt web file show.
rahulraghuwanshii Jan 20, 2023
6dbf5d9
1. PlaygroundFragment.kt web file show.
rahulraghuwanshii Jan 20, 2023
b00ac88
1. create new project done.
rahulraghuwanshii Jan 20, 2023
b450c88
1. hyper nav. change according to requirement.
rahulraghuwanshii Jan 20, 2023
ac0872f
1.Bug fixes.
rahulraghuwanshii Jan 21, 2023
cbbba1a
1.Bug fixes.
rahulraghuwanshii Jan 21, 2023
260b8f2
1. storage changes
rahulraghuwanshii Feb 3, 2023
553d088
Handling api crashes in LearnRepo
Dhan-shri Feb 3, 2023
c50c87d
Merge branch 'removing_chat_tab' into Dhanshri_Sonwane/meraki_crashes
Dhan-shri Feb 4, 2023
2181c15
1. make changes as per requirement.
rahulraghuwanshii Feb 6, 2023
3582d39
Removing unused fragment
Dhan-shri Feb 6, 2023
6c5428b
Merge branch 'removing_chat_tab' into Dhanshri_Sonwane/meraki_crashes
Dhan-shri Feb 6, 2023
b146ad2
1. create new project dialog changes.
rahulraghuwanshii Feb 6, 2023
f7d494a
Merge remote-tracking branch 'origin/Dhanshri_Sonwane/meraki_crashes'…
rahulraghuwanshii Feb 6, 2023
739936e
Merge remote-tracking branch 'origin/scratch_in_app' into rahul_raghu…
rahulraghuwanshii Feb 6, 2023
c575134
1. bug fixes and hyper merge.
rahulraghuwanshii Feb 6, 2023
999d4d4
Merge branch 'scratch_in_app' into rahul_raghuwanshi/internal_release
rahulraghuwanshii Feb 6, 2023
a497d6e
1. internal release.
rahulraghuwanshii Feb 7, 2023
b6295f4
1. internal release.
rahulraghuwanshii Feb 7, 2023
b495788
1. Fix the hyper issue.
rahulraghuwanshii Feb 14, 2023
5c160df
Merge branch 'rahul_raghuwanshi/web_ide_integration' into rahul_raghu…
rahulraghuwanshii Feb 14, 2023
85ce02f
1. Fix the issue .
rahulraghuwanshii Feb 16, 2023
6aab04c
1. Fix the issue .
rahulraghuwanshii Feb 16, 2023
26a56f3
1. Remove dialog for ask override code from python module.
rahulraghuwanshii Mar 1, 2023
721de1e
Merge pull request #247 from navgurukul/main
Anurag-Kumar-Mishra Mar 10, 2023
1ec9445
Merge pull request #250 from navgurukul/main
Anurag-Kumar-Mishra Mar 29, 2023
e776cf4
Project adapter updated
maheshpandey04 Apr 6, 2023
179d36b
issue overriding
maheshpandey04 Apr 6, 2023
fea5d78
extra code removed
maheshpandey04 Apr 6, 2023
f380845
resolved grid problem
maheshpandey04 Apr 8, 2023
315478d
Added API to get S3 Temporary Credentials
Anurag-Kumar-Mishra Apr 8, 2023
70ddbd5
Removed unused code and metadata object request
Anurag-Kumar-Mishra Apr 15, 2023
549a640
Added PUT request for successful upload
Anurag-Kumar-Mishra Apr 20, 2023
e103c6a
Added Share File as Url feature, also, added option to upload backdro…
Anurag-Kumar-Mishra Apr 23, 2023
f84bace
Merge branch 'scratch_in_app' into playground_layout_issues
Anurag-Kumar-Mishra Apr 23, 2023
77feb8a
Merge pull request #252 from navgurukul/playground_layout_issues
Anurag-Kumar-Mishra Apr 23, 2023
adf8545
Revert "Playground layout issues"
Anurag-Kumar-Mishra Apr 23, 2023
4c14e75
Merge pull request #253 from navgurukul/revert-252-playground_layout_…
Anurag-Kumar-Mishra Apr 23, 2023
7dd068d
Merge pull request #256 from navgurukul/main
Anurag-Kumar-Mishra Apr 23, 2023
bc4c828
Changes in few string values.
Anurag-Kumar-Mishra Apr 23, 2023
18677dc
import-LOG
iamvaiibhav19 Apr 29, 2023
b02e47f
Merge branch 'scratch_in_app' into internal-release
iamvaiibhav19 Apr 29, 2023
f1b69b3
removed-extra-log-import
iamvaiibhav19 Apr 29, 2023
3702a3b
assets-files
iamvaiibhav19 Apr 29, 2023
7175522
Shaina/main release 1.5.50 (#258)
shainakhatun Jun 3, 2023
9be5771
GlideToVectorYou
Jun 10, 2023
e19f17f
Connect Python Certificate with Dot.
Jun 12, 2023
445a441
Select Language Page Remove
boyakalyani Jun 14, 2023
85b6e2a
Onboarding illustration fix.
Jun 14, 2023
93504f6
some changes
Jun 14, 2023
37e47d5
Play to Practice
shainakhatun Jun 14, 2023
6530232
Arrange the text buttons
shainakhatun Jun 14, 2023
d7cb539
change the code
shainakhatun Jun 15, 2023
e6268f9
Merge branch 'aayushi_tiwari/certificate_icond_connected' into boya_k…
Jun 16, 2023
069b9e6
merged the branch of dot task
Jun 16, 2023
f84a30e
Merge remote-tracking branch 'origin/boya_kalyani/design_fixes' into …
Jun 16, 2023
b189e82
Youtube video landscape screen
boyakalyani Jun 16, 2023
05d3355
Merge remote-tracking branch 'origin/boya_kalyani/design_fixes' into …
boyakalyani Jun 16, 2023
8454137
removing unwanted code from alertDialog
Jun 16, 2023
85853ca
Remove the color totally
shainakhatun Jun 16, 2023
3370462
Merge remote-tracking branch 'origin/boya_kalyani/design_fixes' into …
shainakhatun Jun 17, 2023
ed68e21
Merge remote-tracking branch 'origin/boya_kalyani/design_fixes' into …
Jun 17, 2023
ed412d5
Merge branch 'internal-release' into boya_kalyani/design_fixes
Dhan-shri Jun 17, 2023
363e733
capslock
Dhan-shri Jun 19, 2023
777fb35
When the user go to editor from course and clicked on back arrow we d…
Jun 20, 2023
111b28f
Merge remote-tracking branch 'origin/boya_kalyani/design_fixes' into …
Jun 20, 2023
73ffb71
Dhanshri sonwane/merd release (#260)
Dhan-shri Jun 30, 2023
260d1c6
Merge remote-tracking branch 'origin/boya_kalyani/design_fixes' into …
Dhan-shri Jun 30, 2023
d7c0306
Revert "Youtube video landscape screen"
Dhan-shri Jul 1, 2023
0d5f92c
Syntax changes
Dhan-shri Jul 1, 2023
1ebd62c
string name changes
Dhan-shri Jul 1, 2023
e10ea8c
Merge pull request #261 from navgurukul/boya_kalyani/design_fixes
Dhan-shri Jul 1, 2023
63b9cbc
adding last_date field to batch
Dhan-shri Jul 1, 2023
42d5d2f
Exception Handling
Jul 11, 2023
e58ee90
Exception Handling removed the unnecessary output screen
Jul 13, 2023
8fcf158
example_editor.xml layout
Jul 14, 2023
4004081
example_editor.xml layout is ready
Jul 14, 2023
d192428
LineNumber added into example_editor file
Jul 17, 2023
fe43fde
nworkin on code editor
Jul 19, 2023
a37a243
Remove the unnecessary code from some classes and files
Jul 20, 2023
03f2618
execution python code functionalities
boyakalyani Jul 20, 2023
50224c5
syntax error related code
boyakalyani Jul 21, 2023
66fdeda
module related problems
Jul 27, 2023
48dfa72
editor
boyakalyani Aug 19, 2023
6347733
output is not displaying
boyakalyani Aug 22, 2023
60de1b1
ui isuue
boyakalyani Aug 28, 2023
9591d34
Python Editor Bug fix
boyakalyani Sep 4, 2023
851f3ce
python output text color changed
boyakalyani Sep 4, 2023
164d4f4
bugs fixed
boyakalyani Sep 6, 2023
ece34c9
color text & space issue
boyakalyani Sep 21, 2023
dfd9265
ui fixed
kalyaniboya Oct 27, 2023
559e3ae
bottom sheet layout file
kalyaniboya Nov 30, 2023
6b969a2
bottom sheet with execution
kalyaniboya Dec 1, 2023
c799201
user input
kalyaniboya Dec 2, 2023
818d5d2
EOF Error Output
kalyaniboya Dec 8, 2023
599c12b
onInput is not working
kalyaniboya Dec 26, 2023
d5e2cc7
binding the bottomsheet
Dhan-shri Jan 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
}

getByName("debug") {
buildConfigField("String", "SERVER_URL", "\"https://dev-api.merakilearn.org/\"")
buildConfigField("String", "SERVER_URL", "\"https://merd-api.merakilearn.org/\"")
}
}
compileOptions {
Expand Down Expand Up @@ -136,6 +136,7 @@ dependencies {
//glide
implementation(GlideDependencies.glide)
kapt(GlideDependencies.glideCompiler)
implementation (GlideDependencies.glideSvg)

//Google play
implementation(GooglePlayDependencies.playCore)
Expand All @@ -150,6 +151,9 @@ dependencies {
androidTestImplementation(TestDependencies.espresso)
implementation ("com.github.barteksc:android-pdf-viewer:2.8.2")

implementation ("com.amazonaws:aws-android-sdk-s3:2.22.+")
implementation ("com.amazonaws:aws-android-sdk-mobile-client:2.22.+")

}

tasks.register<Download>("downloadBundleTools") {
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,25 @@
android:name=".FileChooserActivity"
android:exported="true">

<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="scratch.merakilearn.org"
android:scheme="https" />

<data
android:host="scratch.merakilearn.org"
android:scheme="http" />

</intent-filter>

<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="file" />
<data android:scheme="content" />
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/assets/blocks-only.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="google" value="notranslate">
<meta name='referrer' content='origin-when-cross-origin'>
<link rel="shortcut icon" href="static/favicon.ico">
<title>Scratch 3.0 GUI: Blocks Only Example</title>
<script type="text/javascript" src="mobile-connect.js"></script>
</head>
<body>
<script type="text/javascript" src="lib.min.js"></script><script type="text/javascript" src="chunks/blocksonly.js"></script></body>
</html>
102 changes: 102 additions & 0 deletions app/src/main/assets/chunks/blocksonly.js

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

116 changes: 116 additions & 0 deletions app/src/main/assets/chunks/compatibilitytesting.js

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

Loading