Commit 93b8c503 authored by John's avatar John
Browse files

Attempt to open GitLab.com urls

parent f024f7f7
......@@ -4,7 +4,7 @@ buildscript {
}
 
dependencies {
classpath 'io.fabric.tools:gradle:1.25.1'
classpath 'io.fabric.tools:gradle:1.25.2'
}
}
 
......@@ -92,9 +92,9 @@ android {
}
 
ext {
supportLibVersion = '27.0.2'
retrofitVersion = '2.3.0'
okHttpVersion = '3.9.1'
supportLibVersion = '27.1.1'
retrofitVersion = '2.4.0'
okHttpVersion = '3.10.0'
butterknifeVersion = '8.8.1'
parcelerVersion = '1.1.10'
reptarVersion = '2.5.1'
......@@ -103,7 +103,7 @@ ext {
leakCanaryVersion = '1.5.4'
addendumVersion = '1.7.1'
moshiVersion = '1.5.0'
autodisposeVersion = '0.5.1'
autodisposeVersion = '0.7.0'
}
 
dependencies {
......@@ -138,13 +138,13 @@ dependencies {
implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
implementation "com.jakewharton:butterknife:$butterknifeVersion"
kapt "com.jakewharton:butterknife-compiler:$butterknifeVersion"
implementation 'com.jakewharton.timber:timber:4.6.0'
implementation 'com.jakewharton.timber:timber:4.7.0'
implementation 'com.jakewharton.threetenabp:threetenabp:1.0.5'
 
implementation 'org.greenrobot:eventbus:3.1.1'
 
implementation 'io.reactivex.rxjava2:rxjava:2.1.8'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
 
implementation "com.uber.autodispose:autodispose-kotlin:$autodisposeVersion"
implementation "com.uber.autodispose:autodispose-android-kotlin:$autodisposeVersion"
......@@ -167,13 +167,13 @@ dependencies {
}
implementation 'com.github.Commit451:Easel:3.0.0'
implementation 'com.github.Commit451:Gimbal:2.0.2'
implementation 'com.github.Commit451:Teleprinter:2.0.0'
implementation 'com.github.Commit451:Teleprinter:2.0.2'
implementation 'com.github.Commit451:Jounce:1.0.2'
implementation 'com.github.Commit451:ForegroundViews:2.4.4'
implementation 'com.github.Commit451:MorphTransitions:2.0.0'
implementation "com.github.Commit451:Alakazam:2.0.0"
implementation 'com.github.Commit451:Lift:2.0.1'
implementation 'com.github.Commit451:okyo:3.0.1'
implementation 'com.github.Commit451:okyo:3.0.2'
implementation 'com.github.Commit451:OkioProGuardRules:1.11.0.0'
implementation 'com.github.Commit451:RetrofitProguardRules:2.2.0.0'
implementation 'com.github.Commit451:LoganSquareProGuardRules:1.3.7.0'
......@@ -195,7 +195,7 @@ dependencies {
 
implementation 'com.github.alorma:diff-textview:1.3.0'
 
implementation 'com.wdullaer:materialdatetimepicker:3.5.0'
implementation 'com.wdullaer:materialdatetimepicker:3.5.2'
 
implementation 'com.github.novoda:simple-chrome-custom-tabs:0.1.5'
 
......@@ -210,7 +210,7 @@ dependencies {
 
implementation 'com.github.jkwiecien:EasyImage:2.0.4'
 
implementation 'com.atlassian.commonmark:commonmark:0.10.0'
implementation 'com.atlassian.commonmark:commonmark:0.11.0'
 
normalImplementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') {
transitive = true
......
......@@ -106,8 +106,8 @@
android:noHistory="true"
android:theme="@android:style/Theme.NoDisplay">
 
<!-- Standard Url -->
<intent-filter android:label="@string/deeplink_text">
<!-- For internal deep links -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
 
<category android:name="android.intent.category.BROWSABLE" />
......@@ -115,6 +115,19 @@
 
<data android:scheme="@string/deeplink_scheme" />
</intent-filter>
<!-- GitLab.com -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="gitlab.com"
android:pathPrefix="/"
android:scheme="https" />
</intent-filter>
</activity>
 
<activity android:name=".widget.UserFeedWidgetConfigureActivity">
......
......@@ -31,16 +31,16 @@ import com.commit451.gitlab.util.DownloadUtil
import timber.log.Timber
 
/**
* Shows the details of a merge request
* Shows the details of a build
*/
class BuildActivity : BaseActivity() {
 
companion object {
 
private val REQUEST_PERMISSION_WRITE_STORAGE = 1337
private const val REQUEST_PERMISSION_WRITE_STORAGE = 1337
 
private val KEY_PROJECT = "key_project"
private val KEY_BUILD = "key_merge_request"
private const val KEY_PROJECT = "key_project"
private const val KEY_BUILD = "key_merge_request"
 
fun newIntent(context: Context, project: Project, build: Build): Intent {
val intent = Intent(context, BuildActivity::class.java)
......
......@@ -31,7 +31,7 @@ object Prefs {
const val STARTING_VIEW_TODOS = 3
 
@Retention(AnnotationRetention.SOURCE)
@IntDef(STARTING_VIEW_PROJECTS.toLong(), STARTING_VIEW_GROUPS.toLong(), STARTING_VIEW_ACTIVITY.toLong(), STARTING_VIEW_TODOS.toLong())
@IntDef(STARTING_VIEW_PROJECTS, STARTING_VIEW_GROUPS, STARTING_VIEW_ACTIVITY, STARTING_VIEW_TODOS)
annotation class StartingView
 
private lateinit var prefs: SharedPreferences
......
package com.commit451.gitlab.fragment
 
import android.os.Bundle
import android.support.v4.widget.NestedScrollView
import android.support.v4.widget.SwipeRefreshLayout
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import butterknife.OnClick
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
......@@ -21,14 +23,14 @@ import org.greenrobot.eventbus.Subscribe
import timber.log.Timber
 
/**
* Shows the build artifacts
* Shows the build log
*/
class BuildLogFragment : ButterKnifeFragment() {
 
companion object {
 
private val KEY_PROJECT = "project"
private val KEY_BUILD = "build"
private const val KEY_PROJECT = "project"
private const val KEY_BUILD = "build"
 
fun newInstance(project: Project, build: Build): BuildLogFragment {
val fragment = BuildLogFragment()
......@@ -42,6 +44,8 @@ class BuildLogFragment : ButterKnifeFragment() {
 
@BindView(R.id.swipe_layout)
lateinit var swipeRefreshLayout: SwipeRefreshLayout
@BindView(R.id.scrollView)
lateinit var scrollView: NestedScrollView
@BindView(R.id.log)
lateinit var textLog: TextView
@BindView(R.id.message_text)
......@@ -50,6 +54,16 @@ class BuildLogFragment : ButterKnifeFragment() {
lateinit var project: Project
lateinit var build: Build
 
@OnClick(R.id.buttonBottom)
fun onBottomClicked() {
scrollView.smoothScrollTo(0, Int.MAX_VALUE)
}
@OnClick(R.id.buttonTop)
fun onTopClicked() {
scrollView.smoothScrollTo(0, 0)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
......
......@@ -32,15 +32,15 @@ class ProjectsFragment : ButterKnifeFragment() {
 
companion object {
 
private val EXTRA_MODE = "extra_mode"
private val EXTRA_QUERY = "extra_query"
private val EXTRA_GROUP = "extra_group"
val MODE_ALL = 0
val MODE_MINE = 1
val MODE_STARRED = 2
val MODE_SEARCH = 3
val MODE_GROUP = 4
private const val EXTRA_MODE = "extra_mode"
private const val EXTRA_QUERY = "extra_query"
private const val EXTRA_GROUP = "extra_group"
const val MODE_ALL = 0
const val MODE_MINE = 1
const val MODE_STARRED = 2
const val MODE_SEARCH = 3
const val MODE_GROUP = 4
 
fun newInstance(mode: Int): ProjectsFragment {
val args = Bundle()
......
......@@ -15,7 +15,7 @@ open class Ref {
}
 
@Retention(AnnotationRetention.SOURCE)
@IntDef(TYPE_BRANCH.toLong(), TYPE_TAG.toLong())
@IntDef(TYPE_BRANCH, TYPE_TAG)
annotation class Type
 
var type: Int = 0
......
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
</vector>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
 
......@@ -9,18 +11,47 @@
android:layout_height="match_parent">
 
<android.support.v4.widget.NestedScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical">
 
<TextView
android:id="@+id/log"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" />
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/buttonBottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@null"
android:padding="8dp"
app:srcCompat="@drawable/ic_keyboard_arrow_down_white_24dp" />
<TextView
android:id="@+id/log"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
tools:text="Build log here alksdjflakjsdfljasldfjalsdf"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" />
<ImageView
android:id="@+id/buttonTop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@null"
android:padding="8dp"
app:srcCompat="@drawable/ic_keyboard_arrow_up_white_24dp" />
</LinearLayout>
 
</android.support.v4.widget.NestedScrollView>
 
......
......@@ -505,10 +505,6 @@
<string name="deeplink_scheme">labcoat</string>
<!-- Deep link host -->
<string name="deeplink_host">app</string>
<!-- Deep link titles -->
<string name="deeplink_text">Open with LabCoat</string>
<!-- Deep link paths -->
<string name="deeplink_path_issue">issue</string>
 
<string name="deeplink_navigate_error">No idea where to navigate to</string>
 
......
apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'com.commit451.updatewrapper'
buildscript {
ext.kotlinVersion = '1.2.30'
ext.kotlinVersion = '1.2.31'
repositories {
jcenter()
maven { url "https://jitpack.io" }
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath 'com.github.Commit451:updatewrapper:1.1.2'
classpath 'com.github.Commit451:updatewrapper:1.2.0'
}
}
 
......
#Sat Aug 05 16:54:25 CDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
......@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
 
warn ( ) {
warn () {
echo "$*"
}
 
die ( ) {
die () {
echo
echo "$*"
echo
......@@ -155,7 +155,7 @@ if $cygwin ; then
fi
 
# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment