shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Issue/Comment Reactions (#557)

Browse Source 
Minor performance improvements.

Merge branch 'master' of https://codeberg.org/gitnex/GitNex into issue-reactions

Improving color of selected elements.

First, fully working implementation of reactions.

Merge branch 'master' of https://codeberg.org/gitnex/GitNex into issue-reactions

 Conflicts:
	app/src/main/res/layout/bottom_sheet_issue_comments.xml
	app/src/main/res/layout/list_issue_comments.xml

(Hopefully) fixing merge issues.

Merge branch 'master' of https://codeberg.org/gitnex/GitNex into issue-reactions

 Conflicts:
	app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java
	app/src/main/res/layout/activity_issue_detail.xml
	app/src/main/res/layout/bottom_sheet_issue_comments.xml
	app/src/main/res/layout/bottom_sheet_single_issue.xml
	app/src/main/res/values/colors.xml

Moving reactions below time frame on comments.

Merge branch 'master' into layout-reactions

Add IssueReactions

Merge remote-tracking branch 'origin/layout-reactions' into layout-reactions

Merge branch 'master' of https://gitea.com/gitnex/GitNex into layout-reactions

Merge branch 'master' into layout-reactions

Applying to pulls and issues.

Merge branch 'master' of https://gitea.com/gitnex/GitNex into layout-reactions

Providing external layouts.

Some improvements.

Adding comment emote indications.

Adding circle around emotes.

Adding some padding.

First tests.

Co-authored-by: opyale <opyale@noreply.gitea.io>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/557
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
This commit is contained in:
opyale
2020-11-08 19:58:47 +01:00
committed by M M Arif
co-authored by opyale 6543 6543
parent f97f668363
commit ade7b797f1
33 changed files with 1000 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_issue_detail.xml
+8
View File
@@ -225,6 +225,14 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/commentReactionBadges"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/issueTimeFrame"
android:layout_marginTop="10dp"
android:orientation="horizontal" />
</RelativeLayout>
<View
app/src/main/res/layout/bottom_sheet_issue_comments.xml
+11 -4
View File
@@ -4,10 +4,10 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/primaryBackgroundColor"
android:orientation="vertical"
android:paddingTop="6dp"
android:paddingBottom="12dp"
android:background="?attr/primaryBackgroundColor">
android:paddingBottom="12dp">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
@@ -15,8 +15,15 @@
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/commentReactionButtons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal" />
<TextView
android:id="@+id/commentMenuEdit"
app/src/main/res/layout/bottom_sheet_single_issue.xml
+7
View File
@@ -17,6 +17,13 @@
android:orientation="vertical"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/commentReactionButtons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal" />
<TextView
android:id="@+id/openFilesDiff"
android:layout_width="match_parent"
app/src/main/res/layout/layout_reaction_badge.xml
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView 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="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
app:cardBackgroundColor="?attr/inputBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp">
<TextView
android:id="@+id/symbol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingTop="3dp"
android:paddingRight="8dp"
android:paddingBottom="3dp"
android:textColor="?attr/primaryTextColor"
android:textSize="15sp"
tools:text="👍" />
</androidx.cardview.widget.CardView>
app/src/main/res/layout/layout_reaction_button.xml
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView 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="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
app:cardBackgroundColor="?attr/inputBackgroundColor"
app:cardCornerRadius="25sp"
app:cardElevation="0dp"
app:contentPadding="10dp">
<TextView
android:id="@+id/symbol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
tools:text="👍" />
</androidx.cardview.widget.CardView>
app/src/main/res/layout/list_issue_comments.xml
+7
View File
@@ -71,4 +71,11 @@
android:textIsSelectable="true"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/commentReactionBadges"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal" />
</LinearLayout>
app/src/main/res/values-v23/themes.xml
+2
View File
@@ -17,6 +17,7 @@
<item name="primaryTextColor">@color/lightThemeTextColor</item>
<item name="primaryBackgroundColor">@color/lightThemeBackground</item>
<item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
<item name="inputSelectedColor">@color/lightThemInputSelected</item>
<item name="inputTextColor">@color/lightThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
@@ -57,6 +58,7 @@
<item name="primaryTextColor">@color/retroThemeTextColor</item>
<item name="primaryBackgroundColor">@color/retroThemeBackground</item>
<item name="inputBackgroundColor">@color/retroThemeInputBackground</item>
<item name="inputSelectedColor">@color/retroThemeInputSelected</item>
<item name="inputTextColor">@color/retroThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeRetroCheckBoxStyle</item>
<item name="selectedTextColor">@color/retroThemeColorPrimary</item>
app/src/main/res/values/attrs.xml
+1
View File
@@ -6,6 +6,7 @@
<attr name="primaryTextColor" format="reference"/>
<attr name="primaryBackgroundColor" format="reference" />
<attr name="inputBackgroundColor" format="reference" />
<attr name="inputSelectedColor" format="reference" />
<attr name="hintColor" format="reference" />
<attr name="inputTextColor" format="reference" />
<attr name="selectedTextColor" format="reference" />
app/src/main/res/values/colors.xml
+4 -1
View File
@@ -12,6 +12,7 @@
<color name="btnBackground">#009486</color>
<color name="btnTextColor">#ffffff</color>
<color name="inputBackground">#1d1d1d</color>
<color name="inputSelected">#3A3A3A</color>
<color name="toastBackground">#1d1d1d</color>
<color name="releasePre">#f2711c</color>
<color name="releaseStable">@color/btnBackground</color>
@@ -35,7 +36,8 @@
<color name="lightThemeDiffSelectedColor">#e0e0e0</color>
<color name="lightThemeTextColor">#646565</color>
<color name="lightThemeBackground">#f9f9f9</color>
<color name="lightThemeInputBackground">#f2f2f2</color>
<color name="lightThemeInputBackground">#EFEFEF</color>
<color name="lightThemInputSelected">#C9CCCC</color>
<color name="lightThemeInputTextColor">#212121</color>
<color name="lightThemeDividerColor">#dbdbdb</color>
@@ -45,6 +47,7 @@
<color name="retroThemeTextColor">#212f3c</color>
<color name="retroThemeBackground">#fcfcfc</color>
<color name="retroThemeInputBackground">#f2f2f2</color>
<color name="retroThemeInputSelected">#D3D3D3</color>
<color name="retroThemeInputTextColor">#6200EE</color>
<color name="retroThemeDividerColor">#dbdbdb</color>
<color name="retroThemeColorPrimary">#6200EE</color>
app/src/main/res/values/themes.xml
+3
View File
@@ -17,6 +17,7 @@
<item name="primaryTextColor">@color/colorWhite</item>
<item name="primaryBackgroundColor">@color/colorPrimary</item>
<item name="inputBackgroundColor">@color/inputBackground</item>
<item name="inputSelectedColor">@color/inputSelected</item>
<item name="inputTextColor">@color/colorWhite</item>
<item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
@@ -56,6 +57,7 @@
<item name="primaryTextColor">@color/lightThemeTextColor</item>
<item name="primaryBackgroundColor">@color/lightThemeBackground</item>
<item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
<item name="inputSelectedColor">@color/lightThemInputSelected</item>
<item name="inputTextColor">@color/lightThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
<item name="selectedTextColor">@color/darkGreen</item>
@@ -95,6 +97,7 @@
<item name="primaryTextColor">@color/retroThemeTextColor</item>
<item name="primaryBackgroundColor">@color/retroThemeBackground</item>
<item name="inputBackgroundColor">@color/retroThemeInputBackground</item>
<item name="inputSelectedColor">@color/retroThemeInputSelected</item>
<item name="inputTextColor">@color/retroThemeInputTextColor</item>
<item name="checkboxStyle">@style/AppThemeRetroCheckBoxStyle</item>
<item name="selectedTextColor">@color/retroThemeColorPrimary</item>