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

Minor improvement to password input #1

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
8e9ce26
improved password input (hides chars & view option)
StefanTodoran Apr 5, 2023
0e5154e
Created an initial Multiple Choice List Component
Navkirankn Apr 15, 2023
07b7b27
File for page - Delete Later on
Navkirankn Apr 24, 2023
488ecb5
Delete MainActivity.kt
Navkirankn Apr 24, 2023
2372f50
Delete activity_main.xml
Navkirankn Apr 24, 2023
75fbc6c
Implemented the multiple choice fragment, plus a prototype json integ…
fnehren Apr 24, 2023
f863b19
Example file for the json
fnehren Apr 26, 2023
c280b23
Added hardcoded radiobuttons
Navkirankn Apr 26, 2023
2cd5d88
Code DOES NOT WORK but we're trying...
fnehren Apr 26, 2023
1664591
Code "works" but theoretically this won't be in the final product so …
fnehren Apr 26, 2023
041abf6
Updated MultipleChoiceFragment with back button
fnehren May 3, 2023
eb96640
Initial code for the text component
Navkirankn May 3, 2023
6d68e42
Initial code for the text component
Navkirankn May 3, 2023
f07fecb
multiselect ver.1
evasy May 8, 2023
daa1628
Merge remote-tracking branch 'origin/FrontEndMultipleChoice' into Fro…
evasy May 8, 2023
126c37d
multiselect ver.1.1
evasy May 8, 2023
b589fae
multiselect ver.1.2
evasy May 8, 2023
5942a87
Initial code for the text component
Navkirankn May 8, 2023
2fbe786
Merge remote-tracking branch 'origin/FrontEndMultipleChoice' into Fro…
Navkirankn May 8, 2023
321a863
Got HTTP request working
fnehren May 8, 2023
c07fd3c
Initial code for the text component
Navkirankn May 8, 2023
812fa5c
multiselect ver.1.3
evasy May 10, 2023
b0eb759
New JSON example
fnehren May 10, 2023
ddfda8d
New JSON example + comparison logic
fnehren May 10, 2023
cb59743
Added more code for the textInput
Navkirankn May 10, 2023
4d1718b
multiselect ver.2
evasy May 12, 2023
120b23a
DecisionTreeJSON class created
fnehren May 13, 2023
5c37379
Merge remote-tracking branch 'origin/FrontEndMultipleChoice' into Fro…
fnehren May 13, 2023
27a702f
Everything that I worked on is in here...
fnehren May 13, 2023
d84ab46
Fixed some issues with getting the app to run, moved http request to …
fnehren May 15, 2023
f1f15fb
Added diagnosis activity, beginning two pages, and edited patient act…
fnehren May 15, 2023
04e9f16
Use this URL to get from remote for the demo
fnehren May 15, 2023
a185c5a
Text input works fully now
fnehren May 15, 2023
b922851
small changes
evasy May 15, 2023
d125095
text input text version
evasy May 15, 2023
5303d72
New TextInputTextFragment implemented, but broken lol
fnehren May 15, 2023
cae7c77
ArrayList<JSONObject> for foundlinks
evasy May 15, 2023
7734f33
Added more code for the textInput
Navkirankn May 15, 2023
142d152
Merge remote-tracking branch 'origin/FrontEndMultipleChoice' into Fro…
Navkirankn May 15, 2023
a846ae1
Paragraph Fragment almost completed one error only
Navkirankn May 16, 2023
8df5548
Fixed paragraph stuff a little
fnehren May 16, 2023
9b33751
The back button works again
fnehren May 16, 2023
4d20f6e
Plus one more change lol
fnehren May 16, 2023
434469d
Fixed paragraph a little more
fnehren May 16, 2023
9d79463
make multiple select able to go to the next page without any selections
evasy May 16, 2023
ef1a7bb
Merge remote-tracking branch 'origin/FrontEndMultipleChoice' into Fro…
evasy May 16, 2023
66193a4
Fixed paragraph a little more little more
fnehren May 16, 2023
56f8f83
Merge pull request #1 from StefanTodoran/FrontEndMultipleChoice
evasy May 19, 2023
4c0760e
Arbitrary number of options for MC and some work on text input lol
fnehren May 24, 2023
a45cd7f
New TextInputTextFragment implemented, but broken lol
fnehren May 15, 2023
8f7b220
arbitrary number of options for multiselect
evasy Jun 5, 2023
83d3969
Merge remote-tracking branch 'origin/FrontEndMultipleChoice' into Fro…
fnehren Jun 5, 2023
4e93c45
It works for the workflow still, but it has issues with connecting to…
fnehren Jun 5, 2023
030a396
The June 6 edition minus bugs in the other patients section lol
fnehren Jun 6, 2023
c0192c7
fix bugs
evasy Jun 6, 2023
bad8ef1
fix bugs
evasy Jun 6, 2023
f57376c
The June 6 edition
fnehren Jun 6, 2023
39e2f51
Merge pull request #2 from StefanTodoran/FrontEndMultipleChoice
evasy Jun 10, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
*.iml
.gradle
/local.properties
/.idea/.name
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.idea/deploymentTargetDropDown.xml
.DS_Store
/build
/captures
Expand Down
1 change: 1 addition & 0 deletions .idea/gradle.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

2 changes: 2 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,6 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
implementation 'com.squareup.picasso:picasso:2.8'
implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0"
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
}
11 changes: 9 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />


<application
android:allowBackup="true"
Expand All @@ -13,7 +16,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
android:usesCleartextTraffic="true"
android:requestLegacyExternalStorage="true">
<activity
android:name=".Activities.LearnActivity"
android:exported="true" />
Expand All @@ -26,6 +30,10 @@
android:name=".Activities.DiagnosisActivity"
android:exported="true">
</activity>
<activity
android:name=".Activities.DiagnosisActivityModified"
android:exported="true">
</activity>
<activity
android:name=".Activities.PatientActivity"
android:exported="true"
Expand All @@ -36,7 +44,6 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down
15 changes: 10 additions & 5 deletions app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@
import okhttp3.OkHttpClient;
import okhttp3.logging.HttpLoggingInterceptor;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
import retrofit2.converter.scalars.ScalarsConverterFactory;

public class ApiClient {
private static final String BASE_URL = "http://140.142.142.94/alrite/apis/";
// private static final String BASE_URL = "http://10.0.2.2:8000/alrite/apis/";
private static Retrofit retrofit = null;
public static final String BASE_URL = "http://140.142.142.94/alrite/apis/";
public static final String TEMP_SERV_URL = "http://10.0.2.2:8000";
public static final String REMOTE_URL_TEMP = "http://54.190.44.215:8000";

public static Retrofit getClient() {
// private static final String BASE_URL = "http://10.0.2.2:8000/alrite/apis/";
private static Retrofit retrofit;

public static Retrofit getClient(String URL) {

if (retrofit == null){

Expand All @@ -33,10 +37,11 @@ public static Retrofit getClient() {
.build();

retrofit = new Retrofit.Builder()
.baseUrl(BASE_URL)
.baseUrl(URL)
.client(okHttpClient)
.addConverterFactory(ScalarsConverterFactory.create())
.addConverterFactory(GsonConverterFactory.create(gson))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
}
return retrofit;
Expand Down
21 changes: 21 additions & 0 deletions app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.ug.air.alrite.APIs;

import com.ug.air.alrite.Utils.BackendPostRequest;

import io.reactivex.Observable;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Path;

public interface BackendRequests {

@GET("/alrite/apis/workflows/{workflow_id}/")
Call<String> getJson(@Path("workflow_id") String workflow_id);

@POST("/apis/data/{workflow_id}/{workflow_version}/")
Observable<String> postToBackend(@Path("workflow_id") String workflow_id,
@Path("workflow_version") String workflow_version,
@Body BackendPostRequest body);
}
Loading