Compare revisions

John · John · Noah Prail · John · f024f7f7 · f024f7f7
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -225,7 +225,7 @@ dependencies {
        exclude group: 'com.jakewharton.threetenabp', module: 'threetenabp'
    }
-    androidTestImplementation ('com.android.support.test:runner:1.0.1') {
+    androidTestImplementation('com.android.support.test:runner:1.0.1') {
-        exclude group:'com.android.support', module:'support-annotations'
+        exclude group: 'com.android.support', module: 'support-annotations'
    }
 }
--- a/app/src/main/java/com/commit451/gitlab/App.kt
+++ b/app/src/main/java/com/commit451/gitlab/App.kt
@@ -29,7 +29,7 @@ class App : Application() {
    companion object {
        var bus: EventBus = EventBus.getDefault()
-        lateinit private var instance: App
+        private lateinit var instance: App
        fun bus(): EventBus {
            return bus

--- a/app/src/main/java/com/commit451/gitlab/activity/AboutActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AboutActivity.kt
@@ -49,10 +49,14 @@ class AboutActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.physics_layout) lateinit var physicsLayout: PhysicsFlowLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.progress) lateinit var progress: View
+    lateinit var toolbar: Toolbar
+    @BindView(R.id.physics_layout)
+    lateinit var physicsLayout: PhysicsFlowLayout
+    @BindView(R.id.progress)
+    lateinit var progress: View
    lateinit var sensorManager: SensorManager
    lateinit var gimbal: Gimbal

--- a/app/src/main/java/com/commit451/gitlab/activity/ActivityActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/ActivityActivity.kt
@@ -32,8 +32,10 @@ class ActivityActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.drawer_layout) lateinit var drawerLayout: DrawerLayout
+    @BindView(R.id.drawer_layout)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var drawerLayout: DrawerLayout
+    @BindView(R.id.toolbar)
+    lateinit var toolbar: Toolbar
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

--- a/app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt
@@ -60,20 +60,34 @@ class AddIssueActivity : MorphActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.title_text_input_layout) lateinit var textInputLayoutTitle: TextInputLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.description) lateinit var textDescription: EditText
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.title_text_input_layout)
-    @BindView(R.id.assignee_progress) lateinit var progressAssignee: View
+    lateinit var textInputLayoutTitle: TextInputLayout
-    @BindView(R.id.assignee_spinner) lateinit var spinnerAssignee: Spinner
+    @BindView(R.id.description)
-    @BindView(R.id.milestone_progress) lateinit var progressMilestone: View
+    lateinit var textDescription: EditText
-    @BindView(R.id.milestone_spinner) lateinit var spinnerMilestone: Spinner
+    @BindView(R.id.progress)
-    @BindView(R.id.label_label) lateinit var textLabel: TextView
+    lateinit var progress: View
-    @BindView(R.id.labels_progress) lateinit var progressLabels: View
+    @BindView(R.id.assignee_progress)
-    @BindView(R.id.root_add_labels) lateinit var rootAddLabels: ViewGroup
+    lateinit var progressAssignee: View
-    @BindView(R.id.list_labels) lateinit var listLabels: AdapterFlowLayout
+    @BindView(R.id.assignee_spinner)
-    @BindView(R.id.check_confidential) lateinit var checkConfidential: CheckBox
+    lateinit var spinnerAssignee: Spinner
+    @BindView(R.id.milestone_progress)
+    lateinit var progressMilestone: View
+    @BindView(R.id.milestone_spinner)
+    lateinit var spinnerMilestone: Spinner
+    @BindView(R.id.label_label)
+    lateinit var textLabel: TextView
+    @BindView(R.id.labels_progress)
+    lateinit var progressLabels: View
+    @BindView(R.id.root_add_labels)
+    lateinit var rootAddLabels: ViewGroup
+    @BindView(R.id.list_labels)
+    lateinit var listLabels: AdapterFlowLayout
+    @BindView(R.id.check_confidential)
+    lateinit var checkConfidential: CheckBox
    lateinit var adapterLabels: AddIssueLabelAdapter
    lateinit var teleprinter: Teleprinter

--- a/app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.kt
@@ -45,11 +45,16 @@ class AddLabelActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.list) lateinit var list: RecyclerView
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.message_text) lateinit var textMessage: TextView
+    @BindView(R.id.swipe_layout)
+    lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list)
+    lateinit var list: RecyclerView
+    @BindView(R.id.message_text)
+    lateinit var textMessage: TextView
    lateinit var adapterLabel: LabelAdapter

--- a/app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.kt
@@ -38,7 +38,8 @@ class AddMilestoneActivity : MorphActivity() {
        private val KEY_PROJECT_ID = "project_id"
        private val KEY_MILESTONE = "milestone"
-        @JvmOverloads fun newIntent(context: Context, projectId: Long, milestone: Milestone? = null): Intent {
+        @JvmOverloads
+        fun newIntent(context: Context, projectId: Long, milestone: Milestone? = null): Intent {
            val intent = Intent(context, AddMilestoneActivity::class.java)
            intent.putExtra(KEY_PROJECT_ID, projectId)
            if (milestone != null) {
@@ -48,13 +49,20 @@ class AddMilestoneActivity : MorphActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: FrameLayout
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: FrameLayout
-    @BindView(R.id.title_text_input_layout) lateinit var textInputLayoutTitle: TextInputLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.title) lateinit var textTitle: EditText
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.description) lateinit var textDescription: EditText
+    @BindView(R.id.title_text_input_layout)
-    @BindView(R.id.due_date) lateinit var buttonDueDate: Button
+    lateinit var textInputLayoutTitle: TextInputLayout
-    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.title)
+    lateinit var textTitle: EditText
+    @BindView(R.id.description)
+    lateinit var textDescription: EditText
+    @BindView(R.id.due_date)
+    lateinit var buttonDueDate: Button
+    @BindView(R.id.progress)
+    lateinit var progress: View
    lateinit var teleprinter: Teleprinter

--- a/app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.kt
@@ -47,12 +47,18 @@ class AddNewLabelActivity : BaseActivity(), ColorChooserDialog.ColorCallback {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.title_text_input_layout) lateinit var textInputLayoutTitle: TextInputLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.description) lateinit var textDescription: TextView
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.image_color) lateinit var imageColor: ImageView
+    @BindView(R.id.title_text_input_layout)
-    @BindView(R.id.progress) lateinit var progress: View
+    lateinit var textInputLayoutTitle: TextInputLayout
+    @BindView(R.id.description)
+    lateinit var textDescription: TextView
+    @BindView(R.id.image_color)
+    lateinit var imageColor: ImageView
+    @BindView(R.id.progress)
+    lateinit var progress: View
    var chosenColor = -1

--- a/app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.kt
@@ -40,8 +40,8 @@ class AddUserActivity : MorphActivity() {
    companion object {
-        private val KEY_PROJECT_ID = "project_id"
+        private const val KEY_PROJECT_ID = "project_id"
-        private val KEY_GROUP = "group"
+        private const val KEY_GROUP = "group"
        fun newIntent(context: Context, projectId: Long): Intent {
            val intent = Intent(context, AddUserActivity::class.java)
@@ -56,12 +56,18 @@ class AddUserActivity : MorphActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.search) lateinit var textSearch: EditText
+    @BindView(R.id.toolbar)
-    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.list) lateinit var list: RecyclerView
+    @BindView(R.id.search)
-    @BindView(R.id.clear) lateinit var buttonClear: View
+    lateinit var textSearch: EditText
+    @BindView(R.id.swipe_layout)
+    lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list)
+    lateinit var list: RecyclerView
+    @BindView(R.id.clear)
+    lateinit var buttonClear: View
    lateinit var layoutManager: GridLayoutManager
    lateinit var adapter: UserAdapter
@@ -113,10 +119,11 @@ class AddUserActivity : MorphActivity() {
        dialogAccess = AccessDialog(this, object : AccessDialog.Listener {
            override fun onAccessApplied(accessLevel: Int) {
                dialogAccess.showLoading()
+                val group = group
                if (group == null) {
                    add(App.get().gitLab.addProjectMember(projectId, selectedUser!!.id, accessLevel))
                } else {
-                    add(App.get().gitLab.addGroupMember(projectId, selectedUser!!.id, accessLevel))
+                    add(App.get().gitLab.addGroupMember(group.id, selectedUser!!.id, accessLevel))
                }
            }
        })

--- a/app/src/main/java/com/commit451/gitlab/activity/AttachActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AttachActivity.kt
@@ -46,11 +46,14 @@ class AttachActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root_buttons) lateinit var rootButtons: ViewGroup
+    @BindView(R.id.root_buttons)
-    @BindView(R.id.progress) lateinit var progress: View
+    lateinit var rootButtons: ViewGroup
-    @BindView(R.id.attachCard) lateinit var card: View
+    @BindView(R.id.progress)
+    lateinit var progress: View
-    var project: Project?= null
+    @BindView(R.id.attachCard)
+    lateinit var card: View
+    var project: Project? = null
    @OnClick(R.id.root)
    fun onRootClicked() {

--- a/app/src/main/java/com/commit451/gitlab/activity/BuildActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/BuildActivity.kt
@@ -50,11 +50,16 @@ class BuildActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.tabs) lateinit var tabLayout: TabLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.pager) lateinit var viewPager: ViewPager
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.tabs)
+    lateinit var tabLayout: TabLayout
+    @BindView(R.id.pager)
+    lateinit var viewPager: ViewPager
+    @BindView(R.id.progress)
+    lateinit var progress: View
    lateinit var menuItemDownload: MenuItem

--- a/app/src/main/java/com/commit451/gitlab/activity/DebugActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/DebugActivity.kt
@@ -23,9 +23,12 @@ class DebugActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.text) lateinit var text: TextView
+    @BindView(R.id.toolbar)
+    lateinit var toolbar: Toolbar
+    @BindView(R.id.text)
+    lateinit var text: TextView
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

--- a/app/src/main/java/com/commit451/gitlab/activity/DiffActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/DiffActivity.kt
@@ -42,11 +42,16 @@ class DiffActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.list) lateinit var listDiff: RecyclerView
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.message_text) lateinit var textMessage: TextView
+    @BindView(R.id.swipe_layout)
+    lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list)
+    lateinit var listDiff: RecyclerView
+    @BindView(R.id.message_text)
+    lateinit var textMessage: TextView
    lateinit var adapterDiff: DiffAdapter

--- a/app/src/main/java/com/commit451/gitlab/activity/FileActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/FileActivity.kt
@@ -59,10 +59,14 @@ class FileActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.file_blob) lateinit var webViewFileBlob: WebView
+    @BindView(R.id.toolbar)
-    @BindView(R.id.progress) lateinit var progress: View
+    lateinit var toolbar: Toolbar
+    @BindView(R.id.file_blob)
+    lateinit var webViewFileBlob: WebView
+    @BindView(R.id.progress)
+    lateinit var progress: View
    var projectId: Long = 0
    var path: String? = null

--- a/app/src/main/java/com/commit451/gitlab/activity/FullscreenImageActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/FullscreenImageActivity.kt
@@ -32,8 +32,10 @@ class FullscreenImageActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.toolbar)
-    @BindView(R.id.photo_view) lateinit var photoView: PhotoView
+    lateinit var toolbar: Toolbar
+    @BindView(R.id.photo_view)
+    lateinit var photoView: PhotoView
    lateinit var project: Project

--- a/app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt
@@ -54,13 +54,20 @@ class GroupActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: View
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: View
-    @BindView(R.id.collapsing_toolbar) lateinit var collapsingToolbarLayout: CollapsingToolbarLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.viewpager) lateinit var viewPager: ViewPager
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.tabs) lateinit var tabLayout: TabLayout
+    @BindView(R.id.collapsing_toolbar)
-    @BindView(R.id.backdrop) lateinit var backdrop: ImageView
+    lateinit var collapsingToolbarLayout: CollapsingToolbarLayout
-    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.viewpager)
+    lateinit var viewPager: ViewPager
+    @BindView(R.id.tabs)
+    lateinit var tabLayout: TabLayout
+    @BindView(R.id.backdrop)
+    lateinit var backdrop: ImageView
+    @BindView(R.id.progress)
+    lateinit var progress: View
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

--- a/app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.kt
@@ -42,11 +42,16 @@ class GroupsActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.drawer_layout) lateinit var drawerLayout: DrawerLayout
+    @BindView(R.id.drawer_layout)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var drawerLayout: DrawerLayout
-    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.list) lateinit var listGroups: RecyclerView
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.message_text) lateinit var textMessage: TextView
+    @BindView(R.id.swipe_layout)
+    lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list)
+    lateinit var listGroups: RecyclerView
+    @BindView(R.id.message_text)
+    lateinit var textMessage: TextView
    lateinit var adapterGroup: GroupAdapter
    lateinit var layoutManager: DynamicGridLayoutManager

--- a/app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt
@@ -52,11 +52,16 @@ class IssueActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
-    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    lateinit var root: ViewGroup
-    @BindView(R.id.tabs) lateinit var tabLayout: TabLayout
+    @BindView(R.id.toolbar)
-    @BindView(R.id.pager) lateinit var viewPager: ViewPager
+    lateinit var toolbar: Toolbar
-    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.tabs)
+    lateinit var tabLayout: TabLayout
+    @BindView(R.id.pager)
+    lateinit var viewPager: ViewPager
+    @BindView(R.id.progress)
+    lateinit var progress: View
    lateinit var menuItemOpenClose: MenuItem
    lateinit var teleprinter: Teleprinter
@@ -141,7 +146,7 @@ class IssueActivity : BaseActivity() {
    fun bindIssue() {
        setOpenCloseMenuStatus()
-        toolbar.title = getString(R.string.issue_number, issue?.iid)
+        toolbar.title = getString(R.string.issue_number, issue.iid)
        toolbar.subtitle = project.nameWithNamespace
    }
@@ -169,7 +174,7 @@ class IssueActivity : BaseActivity() {
                    override fun success(issue: Issue) {
                        progress.visibility = View.GONE
                        this@IssueActivity.issue = issue
-                        App.bus().post(IssueChangedEvent(this@IssueActivity.issue!!))
+                        App.bus().post(IssueChangedEvent(this@IssueActivity.issue))
                        App.bus().post(IssueReloadEvent())
                        setOpenCloseMenuStatus()
                    }

--- a/app/src/main/java/com/commit451/gitlab/activity/LaunchActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/LaunchActivity.kt
@@ -25,7 +25,8 @@ class LaunchActivity : BaseActivity() {
        private val REQUEST_DEVICE_AUTH = 123
    }
-    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.root)
+    lateinit var root: ViewGroup
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

--- a/app/src/main/java/com/commit451/gitlab/activity/LoadSomeInfoActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/LoadSomeInfoActivity.kt
@@ -85,7 +85,8 @@ class LoadSomeInfoActivity : BaseActivity() {
        }
    }
-    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.progress)
+    lateinit var progress: View
    private var loadType: Int = 0
No results found