Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
d4ee1595
Commit
d4ee1595
authored
Jul 30, 2018
by
divyanshu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/redesignOnboarding' into redesignOnboarding
# Conflicts: # build.gradle
parents
0230c4c4
1d04208f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
ic_onboarding.xml
app/src/main/res/drawable/ic_onboarding.xml
+1
-1
build.gradle
build.gradle
+1
-0
No files found.
app/src/main/res/drawable/ic_onboarding.xml
View file @
d4ee1595
...
@@ -770,4 +770,4 @@
...
@@ -770,4 +770,4 @@
android:pathData=
"M89.876,190C88.289,190.003 87.003,191.286 87,192.87C87.004,193.159 87.053,193.445 87.144,193.719C87.639,193.823 88.14,193.916 88.648,194C88.193,193.513 88.073,192.802 88.341,192.193C88.609,191.584 89.215,191.192 89.882,191.196L107.855,191.196C108.586,190.843 109.305,190.466 110,190.066C109.803,190.023 109.602,190.001 109.401,190L89.876,190Z"
android:pathData=
"M89.876,190C88.289,190.003 87.003,191.286 87,192.87C87.004,193.159 87.053,193.445 87.144,193.719C87.639,193.823 88.14,193.916 88.648,194C88.193,193.513 88.073,192.802 88.341,192.193C88.609,191.584 89.215,191.192 89.882,191.196L107.855,191.196C108.586,190.843 109.305,190.466 110,190.066C109.803,190.023 109.602,190.001 109.401,190L89.876,190Z"
android:strokeWidth=
"1"
android:strokeWidth=
"1"
android:strokeColor=
"#00000000"
/>
android:strokeColor=
"#00000000"
/>
</vector>
</vector>
\ No newline at end of file
build.gradle
View file @
d4ee1595
...
@@ -10,6 +10,7 @@ buildscript {
...
@@ -10,6 +10,7 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.2.0-beta04'
classpath
'com.android.tools.build:gradle:3.3.0-alpha03'
classpath
'com.android.tools.build:gradle:3.3.0-alpha03'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath
"org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
classpath
"org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment