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

Assistant Feature #12612

Merged
merged 98 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
c577a05
Add assistant to the navbar
alperozturk96 Feb 26, 2024
6afa518
Add Jetpack Compose feature
alperozturk96 Feb 26, 2024
b7b5907
Add ViewModel
alperozturk96 Feb 27, 2024
6767ab8
Add UI Components
alperozturk96 Feb 27, 2024
352b482
Add AssistantRepositoryTests
alperozturk96 Feb 27, 2024
b2c0202
Add AssistantRepository
alperozturk96 Feb 28, 2024
ab78bd8
Add CreateTaskRemoteOperation
alperozturk96 Feb 28, 2024
ca52db7
Add GetTaskListRemoteOperation
alperozturk96 Feb 28, 2024
f55017f
UI Fixes
alperozturk96 Feb 28, 2024
b48ddf5
Add loading and empty states
alperozturk96 Feb 28, 2024
90b4be3
Add loading and empty states
alperozturk96 Feb 28, 2024
5ff7ffa
Add TODO commands
alperozturk96 Feb 28, 2024
9afdbd8
Add Task delete feature
alperozturk96 Feb 29, 2024
07edd95
Add Pull To Refresh for fetching task list
alperozturk96 Feb 29, 2024
cbe3b8e
Better feedback for task deletion
alperozturk96 Feb 29, 2024
642f858
Handle Nullable responses
alperozturk96 Feb 29, 2024
d39d525
Add filter task type
alperozturk96 Feb 29, 2024
a52ec92
Simplify viewModel
alperozturk96 Feb 29, 2024
cbc9466
Add all section to task types
alperozturk96 Feb 29, 2024
9ddf9d9
Add task list selection according to task type
alperozturk96 Feb 29, 2024
5fa6b17
Extract navigation to function
alperozturk96 Feb 29, 2024
b9cc8a1
Solve git conflicts
alperozturk96 Mar 5, 2024
292c660
Reset
alperozturk96 Feb 29, 2024
f21fc1f
Add local libs warnings
alperozturk96 Feb 29, 2024
b77bbe7
Fixes
alperozturk96 Feb 29, 2024
3fc5f42
Navigation fixes
alperozturk96 Feb 29, 2024
22c3c34
UI Fixes
alperozturk96 Feb 29, 2024
6b7fc48
Add Composable function naming convention
alperozturk96 Feb 29, 2024
202d177
Fix code analytics
alperozturk96 Feb 29, 2024
8aa37e8
Add AssistantRepositoryTests
alperozturk96 Feb 29, 2024
5a67b58
Add AssistantRepositoryTests
alperozturk96 Mar 1, 2024
0639983
Fix tests
alperozturk96 Mar 1, 2024
103b84d
Rebase master
alperozturk96 Mar 4, 2024
cca6f60
Rebase master
alperozturk96 Mar 4, 2024
1257ce0
Rebase master
alperozturk96 Mar 4, 2024
7b1c6e4
Rebase master
alperozturk96 Mar 4, 2024
751ef70
Rebase master
alperozturk96 Mar 4, 2024
6ac017d
Rebase master
alperozturk96 Mar 4, 2024
ba3a095
Rebase master
alperozturk96 Mar 4, 2024
f3fc4ed
Rebase master
alperozturk96 Mar 4, 2024
3fdee00
Rebase master
alperozturk96 Mar 4, 2024
658360b
Reset
alperozturk96 Feb 29, 2024
2649b51
Add local libs warnings
alperozturk96 Feb 29, 2024
9076d16
Rebase master
alperozturk96 Mar 4, 2024
1f31127
Rebase master
alperozturk96 Mar 4, 2024
b4c5de4
Add Jetpack Compose ColorScheme
alperozturk96 Mar 1, 2024
62e3f00
Simplify
alperozturk96 Mar 1, 2024
79cffa8
Revert dependency versions
alperozturk96 Mar 1, 2024
6f79f63
Rename const values
alperozturk96 Mar 1, 2024
d492bce
Fix code analytics
alperozturk96 Mar 1, 2024
12454ed
Fix code analytics
alperozturk96 Mar 1, 2024
578ee51
Update Jetpack Compose library version
alperozturk96 Mar 1, 2024
ae4cbb9
Rename enum keys
alperozturk96 Mar 1, 2024
bc16636
UI fixes
alperozturk96 Mar 1, 2024
bab5321
UI fixes
alperozturk96 Mar 1, 2024
bed4fb1
Rebase master
alperozturk96 Mar 4, 2024
a9e102a
Fix Code Analytics
alperozturk96 Mar 4, 2024
c5171d3
Rebase master
alperozturk96 Mar 4, 2024
96deb98
Fix git conflicts
alperozturk96 Mar 11, 2024
6a8b50e
Use Common-UI Lib
alperozturk96 Mar 4, 2024
948f249
lint decreased
alperozturk96 Mar 4, 2024
37af72a
use local common ui lib
alperozturk96 Mar 4, 2024
728767d
UI Fixes
alperozturk96 Mar 4, 2024
cabde4e
Update ui library, add jetpack compose preview capability
alperozturk96 Mar 4, 2024
15c560e
Update ui library, add jetpack compose preview capability
alperozturk96 Mar 4, 2024
2cc60c0
add jetpack compose preview capability
alperozturk96 Mar 5, 2024
4be53bb
Fix tests
alperozturk96 Mar 6, 2024
dbb4aa4
Add Assistant Capability
alperozturk96 Mar 5, 2024
170863b
Fix git conflicts
alperozturk96 Mar 11, 2024
d201f9b
Fix tests
alperozturk96 Mar 5, 2024
f7f6374
Check Capability and server version for tests
alperozturk96 Mar 5, 2024
7c75aee
Fix tests
alperozturk96 Mar 6, 2024
299224b
Fix git conflicts
alperozturk96 Mar 11, 2024
9122fac
Fix screenshot tests
alperozturk96 Mar 8, 2024
d21a629
Take ss of view rather than whole activity
alperozturk96 Mar 8, 2024
e474372
Fix build errors
alperozturk96 Mar 11, 2024
108d522
Use view instead activity for ss tests
alperozturk96 Mar 11, 2024
547a90a
Make AssistantViewModel testable
alperozturk96 Mar 11, 2024
3a842f2
Fix ss tests
alperozturk96 Mar 12, 2024
9ce57d9
Fix ss tests
alperozturk96 Mar 12, 2024
ee066a2
Add new ss tests
alperozturk96 Mar 12, 2024
3fe8030
Reduce kotlin ksp version because compatiblity issue with compose com…
alperozturk96 Mar 12, 2024
b2b3102
Reduce kotlin ksp version because compatiblity issue with compose com…
alperozturk96 Mar 12, 2024
dd64123
Add new ss
alperozturk96 Mar 12, 2024
42d6dbc
Add new ss
alperozturk96 Mar 12, 2024
3ab9241
Add new ss
alperozturk96 Mar 12, 2024
a2b7406
fix database upgrade
tobiasKaminsky Mar 13, 2024
e2b3091
fix database upgrade
tobiasKaminsky Mar 13, 2024
631ddf5
fix database upgrade
tobiasKaminsky Mar 13, 2024
6f77758
Add multine line for add task alert dialog
alperozturk96 Mar 13, 2024
f12657d
Fix text for empty task list
alperozturk96 Mar 13, 2024
ffe1923
Add assistant to header
alperozturk96 Mar 13, 2024
a959c15
Fix crash when no internet connection
alperozturk96 Mar 13, 2024
b50a114
Add Screen State
alperozturk96 Mar 13, 2024
69a4500
Add Assistant under the notification in drawer for branded clients
alperozturk96 Mar 13, 2024
3cd56c7
Check capability
alperozturk96 Mar 13, 2024
9556392
Fix condition
alperozturk96 Mar 13, 2024
d5fded1
Reduce spotbugs
alperozturk96 Mar 13, 2024
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
40 changes: 38 additions & 2 deletions .idea/inspectionProfiles/ktlint.xml

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

15 changes: 14 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {

plugins {
id "com.diffplug.spotless" version "6.20.0"
id 'com.google.devtools.ksp' version '1.9.23-1.0.19' apply false
id 'com.google.devtools.ksp' version '1.9.22-1.0.17' apply false
}

apply plugin: 'com.android.application'
Expand Down Expand Up @@ -223,6 +223,7 @@ android {
dataBinding true
viewBinding true
aidl true
compose = true
}

compileOptions {
Expand All @@ -246,6 +247,10 @@ android {
// Adds exported schema location as test app assets.
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.10"
}
}

dependencies {
Expand All @@ -255,6 +260,14 @@ dependencies {
exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version
}

// Jetpack Compose
implementation(platform("androidx.compose:compose-bom:2024.02.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.material3:material3")
implementation("androidx.compose.ui:ui-tooling-preview:1.6.2")
debugImplementation 'androidx.compose.ui:ui-tooling:1.6.2'

compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
// remove after entire switch to lib v2
implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
Expand Down
2 changes: 1 addition & 1 deletion app/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ naming:
minimumFunctionNameLength: 3
FunctionNaming:
active: true
functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
functionPattern: '^([a-z$A-Z][a-zA-Z$0-9]*)|(`.*`)$'
excludeClassPattern: '$^'
ignoreOverridden: true
excludes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1194,4 +1194,4 @@
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f26afed3b9b87a3acb578947a26223ac')"
]
}
}
}
Loading
Loading