Skip to content
Snippets Groups Projects
Commit 1b72c8f4 authored by John Carlson's avatar John Carlson
Browse files

Change confidential to checkbox instead of switch

parent 4b6aa479
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/build.gradle
+ 5
− 5
View file @ 1b72c8f4
@@ -73,7 +73,7 @@ android {
}
 
ext {
supportLibVersion = '25.3.0'
supportLibVersion = '25.3.1'
retrofitVersion = '2.2.0'
okHttpVersion = '3.6.0'
butterknifeVersion = '8.5.1'
@@ -81,7 +81,7 @@ ext {
parcelerVersion = '1.1.6'
reptarVersion = '2.4.1'
adapterLayout = '1.1.0'
materialDialogsVersion = '0.9.4.2'
materialDialogsVersion = '0.9.4.3'
leakCanaryVersion = '1.5'
}
 
@@ -123,12 +123,12 @@ dependencies {
 
compile 'org.greenrobot:eventbus:3.0.0'
 
compile 'io.reactivex.rxjava2:rxjava:2.0.7'
compile 'io.reactivex.rxjava2:rxjava:2.0.8'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
 
compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.0.1'
 
compile 'net.danlew:android.joda:2.9.7'
compile 'net.danlew:android.joda:2.9.9'
 
compile "org.parceler:parceler-api:$parcelerVersion"
kapt "org.parceler:parceler:$parcelerVersion"
@@ -200,5 +200,5 @@ dependencies {
testCompile "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
 
testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.3.1'
testCompile 'org.robolectric:robolectric:3.3.2'
}
app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt
+ 5
− 6
View file @ 1b72c8f4
@@ -8,12 +8,11 @@ import android.os.Parcelable
import android.support.design.widget.Snackbar
import android.support.design.widget.TextInputLayout
import android.support.v7.app.AlertDialog
import android.support.v7.widget.SwitchCompat
import android.support.v7.widget.Toolbar
import android.view.View
import android.view.ViewGroup
import android.widget.CheckBox
import android.widget.EditText
import android.widget.FrameLayout
import android.widget.Spinner
import android.widget.TextView
import butterknife.BindView
@@ -63,7 +62,7 @@ class AddIssueActivity : MorphActivity() {
}
}
 
@BindView(R.id.root) lateinit var root: FrameLayout
@BindView(R.id.root) lateinit var root: ViewGroup
@BindView(R.id.toolbar) lateinit var toolbar: Toolbar
@BindView(R.id.title_text_input_layout) lateinit var textInputLayoutTitle: TextInputLayout
@BindView(R.id.description) lateinit var textDescription: EditText
@@ -76,7 +75,7 @@ class AddIssueActivity : MorphActivity() {
@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.confidential_switch) lateinit var switchConfidential: SwitchCompat
@BindView(R.id.check_confidential) lateinit var checkConfidential: CheckBox
 
lateinit var adapterLabels: AddIssueLabelAdapter
lateinit var teleprinter: Teleprinter
@@ -224,7 +223,7 @@ class AddIssueActivity : MorphActivity() {
if (!issue?.description.isNullOrEmpty()) {
textDescription.setText(issue!!.description)
}
switchConfidential.isChecked = issue!!.isConfidential
checkConfidential.isChecked = issue!!.isConfidential
}
 
private fun setAssignees() {
@@ -310,7 +309,7 @@ class AddIssueActivity : MorphActivity() {
assigneeId,
milestoneId,
labelsCommaSeperated,
switchConfidential.isChecked)
checkConfidential.isChecked)
}
}
 
app/src/main/res/layout/activity_add_issue.xml
+ 36
− 31
View file @ 1b72c8f4
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root"
android:layout_width="match_parent"
@@ -15,19 +14,22 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"/>
android:layout_height="?attr/actionBarSize" />
 
</android.support.design.widget.AppBarLayout>
 
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize">
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_marginTop="16dp"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginBottom="32dp"
android:orientation="vertical">
 
<android.support.design.widget.TextInputLayout
@@ -41,7 +43,7 @@
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_title"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"/>
android:inputType="textCapSentences|textAutoCorrect|textMultiLine" />
 
</android.support.design.widget.TextInputLayout>
 
@@ -56,14 +58,23 @@
android:layout_height="wrap_content"
android:hint="@string/milestone_hint_description"
android:imeOptions="actionNone"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"/>
android:inputType="textCapSentences|textAutoCorrect|textMultiLine" />
 
</android.support.design.widget.TextInputLayout>
 
<CheckBox
android:id="@+id/check_confidential"
android:layout_width="match_parent"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/confidential_message" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/assignee"/>
android:text="@string/assignee" />
 
<FrameLayout
android:layout_width="match_parent"
@@ -73,20 +84,20 @@
android:id="@+id/assignee_progress"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"/>
android:layout_gravity="center" />
 
<Spinner
android:id="@+id/assignee_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
android:visibility="gone" />
 
</FrameLayout>
 
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/milestone"/>
android:text="@string/milestone" />
 
<FrameLayout
android:layout_width="match_parent"
@@ -98,13 +109,13 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:indeterminate="true"/>
android:indeterminate="true" />
 
<Spinner
android:id="@+id/milestone_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
android:visibility="gone" />
 
</FrameLayout>
 
@@ -112,7 +123,7 @@
android:id="@+id/label_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/labels"/>
android:text="@string/labels" />
 
<FrameLayout
android:layout_width="match_parent"
@@ -124,47 +135,41 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:indeterminate="true"/>
android:indeterminate="true" />
 
<LinearLayout
android:id="@+id/root_add_labels"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:background="?attr/selectableItemBackground"
android:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:visibility="gone"
android:animateLayoutChanges="true"
android:background="?attr/selectableItemBackground">
android:paddingTop="16dp"
android:visibility="gone">
 
<com.commit451.adapterflowlayout.AdapterFlowLayout
android:id="@+id/list_labels"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"/>
android:layout_marginBottom="4dp" />
 
<TextView
android:id="@+id/text_add_labels"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:text="@string/add_labels"/>
android:paddingTop="4dp"
android:text="@string/add_labels" />
 
</LinearLayout>
 
</FrameLayout>
 
<android.support.v7.widget.SwitchCompat
android:id="@+id/confidential_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/confidential"/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
 
<include layout="@layout/progress_fullscreen" />
 
<include layout="@layout/progress_fullscreen"/>
</FrameLayout>
\ No newline at end of file
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
+ 1
− 1
View file @ 1b72c8f4
@@ -220,7 +220,7 @@
<string name="label_already_added">Label already added</string>
<string name="failed_to_delete_issue">Failed to delete issue</string>
<string name="issue_deleted">Issue deleted</string>
<string name="confidential">Confidential</string>
<string name="confidential_message">This issue is confidential and should only be visible to team members with at least Reporter access.</string>
 
<!-- Labels -->
<string name="labels">Labels</string>
build.gradle
+ 1
− 1
View file @ 1b72c8f4
@@ -8,7 +8,7 @@ buildscript {
maven { url "https://jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
//check with ./gradlew dependencyUpdates
classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
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