Skip to content
Snippets Groups Projects
Commit 6c016a2d authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Merge branch 'develop'

parents caf35d96 af2a2bcb
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 126 additions and 100 deletions
app/src/main/res/layout/activity_issue.xml
+ 31
− 11
View file @ 6c016a2d
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -24,6 +25,14 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" />
 
<TextView
android:id="@+id/issue_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_marginRight="56dp"
tools:text="This is an issue"/>
</android.support.design.widget.AppBarLayout>
 
<com.commit451.gitlab.views.GitLabSwipeRefreshLayout
@@ -53,23 +62,34 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:hint="@string/new_note_hint"
android:inputType="text|textCapSentences|textAutoComplete" />
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone" />
 
<ImageButton
<ImageView
android:id="@+id/new_note_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:state_enabled="false"
android:focusable="true"
android:contentDescription="@string/add_note_content_description"
android:src="@drawable/ic_send_24dp" />
android:layout_height="match_parent"
android:paddingRight="16dp"
android:paddingLeft="16dp"
android:contentDescription="@null"
android:src="@drawable/ic_send_24dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
 
</LinearLayout>
 
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_edit_issue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:src="@drawable/ic_edit_24dp"
app:fabSize="mini"
app:layout_anchor="@id/appbar"
app:layout_anchorGravity="bottom|right|end"/>
<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/layout/dialog_add_issue.xml
+ 62
− 62
View file @ 6c016a2d
@@ -2,85 +2,85 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="8dp">
android:layout_height="wrap_content"
android:minWidth="256dp">
 
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content">
 
<android.support.design.widget.TextInputLayout
android:id="@+id/titleInputLayout"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">
 
<EditText
android:id="@+id/title_input"
<android.support.design.widget.TextInputLayout
android:id="@+id/titleInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:ems="10"
android:hint="@string/title_hint"
android:inputType="text|textCapWords">
android:layout_height="wrap_content">
 
<requestFocus />
</EditText>
<EditText
android:id="@+id/title_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/title_hint"
android:singleLine="false"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone">
 
</android.support.design.widget.TextInputLayout>
<requestFocus />
</EditText>
 
<android.support.design.widget.TextInputLayout
android:id="@+id/descriptionInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</android.support.design.widget.TextInputLayout>
 
<EditText
android:id="@+id/description_input"
<android.support.design.widget.TextInputLayout
android:id="@+id/descriptionInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:ems="10"
android:hint="@string/description_hint"
android:inputType="text|textCapSentences" />
android:layout_height="wrap_content">
 
</android.support.design.widget.TextInputLayout>
<EditText
android:id="@+id/description_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/description_hint"
android:singleLine="false"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone" />
 
<View
android:id="@+id/lsep"
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/dividerHorizontal" />
</android.support.design.widget.TextInputLayout>
 
<LinearLayout
android:id="@+id/lin"
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/cancel_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
android:text="@string/cancel_button" />
<Button
android:id="@+id/save_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
android:text="@string/save_button" />
android:layout_gravity="right"
android:orientation="horizontal">
<Button
android:id="@+id/cancel_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
android:text="@string/cancel_button"
android:textColor="?attr/colorAccent" />
<Button
android:id="@+id/save_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
android:text="@string/save_button"
android:textColor="?attr/colorAccent" />
</LinearLayout>
 
</LinearLayout>
</ScrollView>
 
</LinearLayout>
<include layout="@layout/progress_fullscreen"/>
<include layout="@layout/progress_fullscreen" />
 
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_logout.xml
+ 2
− 2
View file @ 6c016a2d
@@ -2,12 +2,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp">
android:padding="16dp"
android:minWidth="256dp">
 
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/logout_title"
android:id="@+id/textView" />
 
app/src/main/res/layout/dialog_remove_user.xml
+ 1
− 0
View file @ 6c016a2d
@@ -3,6 +3,7 @@
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minWidth="256dp"
android:orientation="horizontal" >
 
<Button
app/src/main/res/layout/item_header_issue.xml
+ 9
− 23
View file @ 6c016a2d
@@ -6,26 +6,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
 
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/padding_normal"
tools:text="Title"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/padding_normal"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
tools:text="Description"
android:textAppearance="?android:attr/textAppearanceMedium" />
 
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_margin="16dp">
 
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/author_image"
@@ -33,25 +28,16 @@
android:layout_height="@dimen/image_size"
android:contentDescription="@null"/>
 
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Jawnnypoo"
android:layout_marginLeft="@dimen/padding_normal"
android:layout_marginRight="@dimen/padding_normal"
android:layout_gravity="center_vertical"
tools:text="Jawnnypoo created issue 8 hours ago"
android:textAppearance="?android:attr/textAppearanceMedium" />
 
<TextView
android:id="@+id/date_added"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="3 Weeks ago"/>
</LinearLayout>
</LinearLayout>
 
 
app/src/main/res/layout/item_note.xml
+ 2
− 0
View file @ 6c016a2d
@@ -7,6 +7,8 @@
android:layout_height="wrap_content"
android:gravity="start"
android:minHeight="?android:attr/listPreferredItemHeight"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
 
<de.hdodenhof.circleimageview.CircleImageView
app/src/main/res/menu/issue.xml
+ 5
− 0
View file @ 6c016a2d
@@ -2,6 +2,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
 
<item
android:id="@+id/action_close"
app:showAsAction="ifRoom"
android:title="@string/action_close"/>
<item
android:id="@+id/action_share"
app:showAsAction="ifRoom"
app/src/main/res/values/strings.xml
+ 6
− 0
View file @ 6c016a2d
@@ -16,6 +16,7 @@
<string name="action_about">About</string>
<string name="action_search">Search</string>
<string name="action_copy_link">Copy link</string>
<string name="action_close">Close</string>
 
<!-- Tabs -->
<string name="title_overview">Overview</string>
@@ -89,6 +90,7 @@
<string name="error_creating_account">Error creating account</string>
 
<string name="required_field">Required Field</string>
<string name="wait_for_project_to_load">Wait for the project to load!</string>
<!-- General -->
<string name="projects">Projects</string>
<string name="no_projects">No projects.</string>
@@ -123,6 +125,10 @@
<string name="description_hint">Description</string>
<string name="add_note_content_description">Add note</string>
<string name="issue_number">Issue #</string>
<string name="reopen">Reopen</string>
<string name="close">Close</string>
<string name="created_issue">created issue</string>
<string name="error_changing_issue">There was an error changing the issue</string>
 
<!-- User -->
<string name="remove_user_dialog_title">Remove user?</string>
app/src/main/res/values/styles.xml
+ 8
− 2
View file @ 6c016a2d
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/purple</item>
<item name="colorPrimaryDark">@color/purple_dark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor" tools:ignore="NewApi">?attr/colorPrimaryDark</item>
<item name="colorAccent">@color/yellow</item>
<item name="dialogTheme">@style/AppDialogTheme</item>
</style>
<style name="AppDialogTheme" parent="Theme.AppCompat.Dialog">
<item name="colorAccent">@color/yellow</item>
<item name="windowNoTitle">true</item>
</style>
 
<style name="Card">
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