Skip to content

Commit

Permalink
Up to date develop (AOSSIE-Org#143)
Browse files Browse the repository at this point in the history
* Setting up the project codebase

* integrated flutter module

* integrated firebae with app

* UX/UI: Splash Screen added

* feat: App Icon

* feat: App Intro Screens

* feat: User Login, Google Sign-In

* feat: User registration, Sign up screen

* UX/UI: App Home Screen, Carousel, Bottom Nav bar

* feat: Check for Logged In User

* feat: popular monuments, feed firestore, link home

* feat: Explore Popular Monuments

* feat: Setup for Native Monument Detector

* feat: Monument Detector screen and Detection

* feat: building model, arfragment set up and more

* feat: Model rendering from POLY Rest API

* feat:upgrades on AR fragment, more models, ux improved, cleanup

* feat, chore: AR fragment improvements, sliding Wikipedia panel, data sharing across detector and ar frag

* feat: Wikipedia panel update

* feat: DB data in Monument Detector and AR Fragment

* feat: Detail page, Animations, Wikipedia

* feat: Visualize Popular Monuments in AR directly

* feat: Bookmark Monuments, writing to DB for bookmarks

* feat: Bookmark updates, Unique User Auth id for bookmark and more

* feat: Profile Screen, User details creation while logging and more

* feat: Updates, Polishing and UX final touches

* some finalized updates to the app

* Adding Non-AR devices support to use app

* chore: Code Cleanup and structured

* chore: Project Documentation

* Added Demo Videos to doc

* Back button after Sign In or Sign Up now does not takes backthe user to the Sign IN/UP screen. It exits the app

* Removed unwanted files

* Update the flutter module path

* Update CODEOWNERS

* added progresscircularIndicator until the WikiPedia content is uploaded

* feat: user can toggle the bookmark (add or remove the bookmark

* after removing monumnets from the bookmark,bookmark screen will refresh now

* Added a contributing.md file

* Used the 'Merge Request' word convention instead of 'Pull Request'.

* fix: circularProgressIndicator added in BookmarkScreen

* added circularProgressIndicator in BookmarkScreen

* Fixed Pixel OverFlow error of Bookmark and explore screen

* Removed unwanted files

* Fixed PixelOverFlow error for BookmarkCarousel and PopularCarousel

* Fixed all deprecation and other warnings

* fix:update profile pic

* final commit

* added Google Map setup

* added geocoder and googlemap package

* added GoogleMapScreen

* revert

* Revert "fix:update profile pic"

commit
This reverts commit 52a8b3b.

* user can hide or see their password in textfiled

* hide/see password in Signup screen

* resolved conflits

* resolve conflits

* fix:pixel over flow

* fix : pixel overflow problem in detailsScreen

* authentication part of the app code migrated

* Completely migrated the app

* Added profile bloc

* Removed unwanted comments

* Added Models and Entities

* Implement NewPostScreen and create Social Models and Entities

* Add the profile bloc

* Implement Feed Screen and Blocs

* Implement Discover Screen and Blocs

* Provided Feed Bloc

* Implement Profile Screen

* Add Loading Indicator NewPostScreen

* Removed commented code

* Implement Comments Screen

* Implement Monumento Screen and Follow-Unfollow Business Logic

* Implement Notifications Screen and Blocs

* Change TextStyle of NotificationTile

* Improve Auth Flow, Implement Profile Form when user signs in through google for the first time

* Complete Navigation, Improve UI

* Add form validations, replace deprecated poly links, refactor code, format code

* Remove unused imports

* Remove print statements

* Fixed some bugs

* Fixed bugs

* Replaced Poly Links with firebase storage links

* Added GSoC21 Student Doc

* Added Working demo, created firestore index, fixed some minor bugs

* Modified GSoC21 Doc

* Resolve keyboard opening on navigation

---------

Co-authored-by: Jaideep Prasad <[email protected]>
Co-authored-by: Kenal <[email protected]>
Co-authored-by: Mukul Kumar <[email protected]>
Co-authored-by: PaRaDoX50 <[email protected]>
Co-authored-by: Souvik Biswas <[email protected]>
Co-authored-by: Avinash Kumar <[email protected]>
  • Loading branch information
7 people authored Mar 5, 2023
1 parent fba58a1 commit 5bb8c83
Show file tree
Hide file tree
Showing 163 changed files with 11,541 additions and 1 deletion.
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
122 changes: 122 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.

27 changes: 27 additions & 0 deletions .idea/gradle.xml

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

9 changes: 9 additions & 0 deletions .idea/misc.xml

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

12 changes: 12 additions & 0 deletions .idea/runConfigurations.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/vcs.xml

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

2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Project code owners

* @MukulCode @designKenal
* @MukulCode @designKenal @jddeep

# Both usernames or email addresses can be used to match
# users. Everything else will be ignored. For example this will
Expand Down
2 changes: 2 additions & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

/build
89 changes: 89 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.google.gms.google-services'
//apply plugin: 'com.google.ar.sceneform.plugin'
//sceneform.asset('sampledata/taj.obj', // 'Source Asset Path' specified during import.
// 'default', // 'Material Path' specified during import.
// 'sampledata/taj.sfa', // '.sfa Output Path' specified during import.
// 'src/main/res/raw/taj')

android {
compileSdkVersion 29
buildToolsVersion "29.0.3"

defaultConfig {
applicationId "com.jddeep.monumento"
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName "1.0"
multiDexEnabled true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
debuggable true
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

configurations.all {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
}

lintOptions {
checkReleaseBuilds false

abortOnError false
}

}

//repositories {
// maven {
// url '/home/jddeep/Monumento/monumento_module/build/host/outputs/repo'
// }
// maven {
// url 'https://storage.googleapis.com/download.flutter.io'
// }
// }


dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
// implementation 'com.google.firebase:firebase-analytics:17.2.2'
implementation('com.google.api-client:google-api-client-android:1.20.0', {
exclude module: 'httpclient'
exclude group: 'com.google.guava'
})
implementation('com.google.http-client:google-http-client-gson:1.20.0', {
exclude module: 'httpclient'
exclude group: 'com.google.guava'
})
implementation('com.google.apis:google-api-services-vision:v1-rev2-1.21.0', {
exclude module: 'httpclient'
exclude group: 'com.google.guava'
})
implementation "com.google.ar.sceneform.ux:sceneform-ux:1.15.0"
implementation 'com.google.ar.sceneform:assets:1.15.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.sothree.slidinguppanel:library:3.4.0'
// releaseImplementation 'com.jddeep.monumento:flutter_release:1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation project(path: ':flutter')
}
47 changes: 47 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"project_info": {
"project_number": "23340623187",
"firebase_url": "https://monumento-277103.firebaseio.com",
"project_id": "monumento-277103",
"storage_bucket": "monumento-277103.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:23340623187:android:7054148e8a1dee1ff8eda6",
"android_client_info": {
"package_name": "com.jddeep.monumento"
}
},
"oauth_client": [
{
"client_id": "23340623187-qdin8qjrrho0916p35v01pog92mcovfb.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAAuo4k8RSXYVadVB2WTBK_gLd8bhbYSu8"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "23340623187-qdin8qjrrho0916p35v01pog92mcovfb.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "23340623187-srpehbrmbciom06pvq4qcnarc22gkud1.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "aossie.Monumento"
}
}
]
}
}
}
],
"configuration_version": "1"
}
12 changes: 12 additions & 0 deletions app/monumento-277103-9b64bd53f3b8.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "service_account",
"project_id": "monumento-277103",
"private_key_id": "9b64bd53f3b8c5e574a6171f8c8597c34a6cf962",
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC+85aNccLYBUpX\nm3g2OPI7klbzDUsGsL9C87FLTfHcwl5RdMJoEytaRDftiGhmNDRpxLVoVm3Qgwrf\nWmpaAYzG1ugfo5W2+7AxnR7vptpwXLaRj7QPZVLUcEkmQ5SstWxHdHFH3kiOtb09\nrFNYF16NP0Lbr/cLjmK1UaWrRHA+e7oJB9lwlDjJIO2tPGAS52nfJDT4b6a3VuVK\nHYn5gQZjEP9nSFo9LInOuVyWoOf1V0qVhxr7Ak8S5n/MtmO5bHS6csnwzaJm8Cti\n+bdfPK6Aoc1OSMk0Sc0qZfM7gbaaB3yKcxvFn+SpalzIBAfzkEoiI7yPAXQfy0L9\n6sMg3zYHAgMBAAECggEAE+kPRjFZ+S9YCJl/59t5OofwRAibTZfJYaBKWMlIUlX8\nAq9ThAmXqCJb2Is0I5AG9Q5bQgVdDvRTAmYJl9f4h1UqP/5NIpbM0OeKrb9uoG+y\nY6whwMc2Y0tP/UrnqjiCkVLNawp881B06oTY7eMF62Fwxbpr3osatMBOL3UD5SfQ\nCPz8HlP63tXcxgXzYO4yTl6KCmFCoKZsXxXI+KMZ9BO2ZFXCX/n/m0LTLm2RHVa9\nuX58wquInC4PtQ/DjjEZkdkHLWu2FYJxSYBGeN9IzhOd2SW+Wm3zAbZtzNw+ezYL\nRlH+1pOYTGmgeqg8Qz1g1IPiiun/CnOPi12ATpZP/QKBgQD7ezrAMRCgNVIN+tjp\nKni8oOT/UNj3Akak5dATuybV/6KPonCmOWAMlspUGCKEjfLgHb2nStbYAM9ox/F1\ngBRbtzKA68qRrbcW25I8Hsa293XtW2U8Z9kneTSCYIPTGbLo2wFSk1mzuMeYkHrB\necJbb9WlfAIdah2tERzfitCQZQKBgQDCYe6Mc8oON2+CSdKBy5VZD/yMZu+Q3DqG\n872akP3qXUM5ikh1G0FLSjyZ+GMrkc4h+BtV3LOhfSua2DVtEt1EYKQ3K61tBdn9\nP4LnrnW3f7cNAZuyZ4rMZ1HKCvX4poqKywaGXE9DA+6J1vf2FQszIDF3dDrZfkRo\n6qYA9BVn+wKBgCDO9N06CXc9PZVBUqcouVOyke2VOJkRHPJKYRkR44ErtqOSh6vH\n9HXv/jl2ZJpygmsmtiVrKBhKEsUSwLeZnA5TGi2jlWvoA+jhgHSDd11Lb4El2VFG\nIxh5QZZ4zPnvcl3apJOHUb6WrsOCpeEz511Se8b5JLV9sJ1xjBjF3WvZAoGALV1r\nre3MBzta095kuZQIu+tmNmJDoNw08I/r/Sm/iLXRXZlvRZ1hxK+Dqy9z/ZQetoDP\n6F8EsTikN5QkC9uuNioTyShxZhNKh7cN1wI5SOUOlIN+kclmdEPcq7mZJDnB9Zhi\nYnMisHI3doXsAstwfLMTuFww69dzIcU5jtloMYcCgYBrU8ZNPm0P3XSi5h7Cu4RL\na2+d1sOoHyV6IIzGR5qK3Lv156/Cav+jOYlAWdRTrCpSr3ccLufalKqpYjytuWzM\naGq+OGdqq8DNposXiSYLa7PCrjRumMyKJk8xGP0HAWU3PaGvAx4kDyOYoSXbpgfU\nAg9cB/mohVis3S8SWG45oQ==\n-----END PRIVATE KEY-----\n",
"client_email": "monumento-service-account@monumento-277103.iam.gserviceaccount.com",
"client_id": "113300677752499556518",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/monumento-service-account%40monumento-277103.iam.gserviceaccount.com"
}
21 changes: 21 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
1 change: 1 addition & 0 deletions app/release/output.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
Loading

0 comments on commit 5bb8c83

Please sign in to comment.