diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
index b9269c4c..98ccda30 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -478,7 +478,7 @@ public class IssueDetailActivity extends AppCompatActivity {
case "pretty": {
PrettyTime prettyTime = new PrettyTime(new Locale(locale));
String createdTime = prettyTime.format(singleIssue.getCreated_at());
- issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+ issueCreatedTime.setText(createdTime);
issueCreatedTime.setVisibility(View.VISIBLE);
issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getCreated_at()), getApplicationContext()));
break;
@@ -486,14 +486,14 @@ public class IssueDetailActivity extends AppCompatActivity {
case "normal": {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
String createdTime = formatter.format(singleIssue.getCreated_at());
- issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+ issueCreatedTime.setText(createdTime);
issueCreatedTime.setVisibility(View.VISIBLE);
break;
}
case "normal1": {
DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
String createdTime = formatter.format(singleIssue.getCreated_at());
- issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+ issueCreatedTime.setText(createdTime);
issueCreatedTime.setVisibility(View.VISIBLE);
break;
}
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
index f01b36dd..f3723597 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
@@ -13,6 +13,7 @@ import org.mian.gitnex.activities.AddRemoveAssigneesActivity;
import org.mian.gitnex.activities.AddRemoveLabelsActivity;
import org.mian.gitnex.activities.EditIssueActivity;
import org.mian.gitnex.activities.ReplyToIssueActivity;
+import org.mian.gitnex.helpers.Toasty;
import org.mian.gitnex.util.TinyDB;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -85,14 +86,14 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
@Override
public void onClick(View v) {
- //get url of repo
+ // get url of repo
String repoFullName = tinyDB.getString("repoFullName");
String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
if(!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
}
- //get issue Url
+ // get issue Url
String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
// copy to clipboard
@@ -102,6 +103,8 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
dismiss();
+ Toasty.info(getContext(), getContext().getString(R.string.copyIssueUrlToastMsg));
+
}
});
diff --git a/app/src/main/res/drawable/ic_comment_20.xml b/app/src/main/res/drawable/ic_comment_20.xml
new file mode 100644
index 00000000..8a5e73a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_comment_20.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/round_corners.xml b/app/src/main/res/drawable/round_corners.xml
index 2b483c75..bef6d1ab 100644
--- a/app/src/main/res/drawable/round_corners.xml
+++ b/app/src/main/res/drawable/round_corners.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 5b9f4d0d..84515c6b 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -51,7 +51,6 @@
android:id="@+id/assigneeAvatar"
android:layout_width="48dp"
android:layout_height="48dp"
- android:layout_marginTop="5dp"
android:layout_marginEnd="15dp"
android:contentDescription="@string/generalImgContentText" />
diff --git a/app/src/main/res/layout/admin_users_list.xml b/app/src/main/res/layout/admin_users_list.xml
index dd09d217..09f33e17 100644
--- a/app/src/main/res/layout/admin_users_list.xml
+++ b/app/src/main/res/layout/admin_users_list.xml
@@ -21,7 +21,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_marginTop="5dp"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
@@ -31,7 +30,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:scaleType="fitCenter"
- android:layout_marginTop="5dp"
android:contentDescription="@string/userRoleAdmin"
android:src="@drawable/ic_android" />
diff --git a/app/src/main/res/layout/collaborators_list_search.xml b/app/src/main/res/layout/collaborators_list_search.xml
index 22bdbf95..b9e6fd8a 100644
--- a/app/src/main/res/layout/collaborators_list_search.xml
+++ b/app/src/main/res/layout/collaborators_list_search.xml
@@ -13,7 +13,6 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="15dp"
- android:layout_marginTop="5dp"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index d7803735..5c3a6328 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -23,8 +23,6 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_gravity="start"
- android:layout_marginTop="2dp"
- android:layout_marginBottom="5dp"
android:contentDescription="@string/logo"
android:src="@mipmap/app_logo_round" />
diff --git a/app/src/main/res/layout/issue_comments.xml b/app/src/main/res/layout/issue_comments.xml
index 215f5284..ac37f823 100644
--- a/app/src/main/res/layout/issue_comments.xml
+++ b/app/src/main/res/layout/issue_comments.xml
@@ -34,8 +34,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
- android:layout_marginTop="5dp"
- android:layout_marginBottom="5dp"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
diff --git a/app/src/main/res/layout/my_repos_list.xml b/app/src/main/res/layout/my_repos_list.xml
index c8ff7646..0512fca5 100644
--- a/app/src/main/res/layout/my_repos_list.xml
+++ b/app/src/main/res/layout/my_repos_list.xml
@@ -22,7 +22,6 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="15dp"
- android:layout_marginTop="5dp"
android:contentDescription="@string/repoContentAvatar"
android:src="@drawable/ic_android" />
@@ -53,9 +52,8 @@
android:layout_weight=".05"
android:id="@+id/imageRepoTypeMy"
android:layout_width="10dp"
- android:layout_height="25dp"
+ android:layout_height="20dp"
android:layout_gravity="end"
- android:layout_marginTop="5dp"
android:contentDescription="@string/privateAvatar"
android:src="@drawable/ic_lock_bold" />
diff --git a/app/src/main/res/layout/organizations_list.xml b/app/src/main/res/layout/organizations_list.xml
index eff210ac..efa335b8 100644
--- a/app/src/main/res/layout/organizations_list.xml
+++ b/app/src/main/res/layout/organizations_list.xml
@@ -22,7 +22,6 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="15dp"
- android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:src="@drawable/ic_android"
android:contentDescription="@string/orgContentAvatar"/>
diff --git a/app/src/main/res/layout/profile_followers_list.xml b/app/src/main/res/layout/profile_followers_list.xml
index c8f74c41..eea63075 100644
--- a/app/src/main/res/layout/profile_followers_list.xml
+++ b/app/src/main/res/layout/profile_followers_list.xml
@@ -13,8 +13,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
- android:layout_marginTop="5dp"
- android:layout_marginBottom="5dp"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
diff --git a/app/src/main/res/layout/profile_following_list.xml b/app/src/main/res/layout/profile_following_list.xml
index c8f74c41..eea63075 100644
--- a/app/src/main/res/layout/profile_following_list.xml
+++ b/app/src/main/res/layout/profile_following_list.xml
@@ -13,8 +13,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
- android:layout_marginTop="5dp"
- android:layout_marginBottom="5dp"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
diff --git a/app/src/main/res/layout/repo_detail_issues_list.xml b/app/src/main/res/layout/repo_detail_issues_list.xml
index a2687dae..1591583b 100644
--- a/app/src/main/res/layout/repo_detail_issues_list.xml
+++ b/app/src/main/res/layout/repo_detail_issues_list.xml
@@ -20,8 +20,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
- android:layout_marginTop="5dp"
- android:layout_marginBottom="5dp"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
@@ -57,9 +55,8 @@
@@ -86,10 +83,10 @@
android:layout_height="wrap_content"
android:gravity="start"
android:drawablePadding="5dp"
- android:drawableStart="@drawable/ic_comment_16"
+ android:drawableStart="@drawable/ic_comment_20"
android:layout_gravity="center_horizontal"
android:textColor="@color/colorWhite"
- android:textSize="12sp" />
+ android:textSize="14sp" />
@@ -100,7 +97,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/colorWhite"
- android:textSize="12sp" />
+ android:textSize="14sp" />
diff --git a/app/src/main/res/layout/repos_list.xml b/app/src/main/res/layout/repos_list.xml
index ac788657..7940a4d3 100644
--- a/app/src/main/res/layout/repos_list.xml
+++ b/app/src/main/res/layout/repos_list.xml
@@ -23,7 +23,6 @@
android:layout_height="40dp"
android:layout_marginEnd="15dp"
android:contentDescription="@string/repoContentAvatar"
- android:layout_marginTop="5dp"
android:src="@drawable/ic_android" />
diff --git a/app/src/main/res/layout/repositories_by_org_list.xml b/app/src/main/res/layout/repositories_by_org_list.xml
index 52bdb5cd..95bea649 100644
--- a/app/src/main/res/layout/repositories_by_org_list.xml
+++ b/app/src/main/res/layout/repositories_by_org_list.xml
@@ -1,145 +1,139 @@
-
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="0dp"
+ android:fitsSystemWindows="true"
+ android:orientation="vertical"
+ android:layout_margin="10dp"
+ android:theme="@style/AppTheme"
+ android:background="@color/backgroundColor"
+ tools:context=".activities.MainActivity">
-
+
+
-
-
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@+id/imageAvatar"
+ android:orientation="vertical">
-
-
-
-
-
-
-
-
+ android:orientation="horizontal">
+ android:text="@string/repoName"
+ android:textColor="@color/white"
+ android:textSize="18sp" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/starred_repos_list.xml b/app/src/main/res/layout/starred_repos_list.xml
index 2a52cdd2..0b5f06ad 100644
--- a/app/src/main/res/layout/starred_repos_list.xml
+++ b/app/src/main/res/layout/starred_repos_list.xml
@@ -1,145 +1,139 @@
-
+ android:layout_height="match_parent"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="0dp"
+ android:fitsSystemWindows="true"
+ android:orientation="vertical"
+ android:padding="10dp"
+ android:theme="@style/AppTheme"
+ android:background="@color/backgroundColor"
+ tools:context=".activities.MainActivity">
-
+
+
-
-
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@+id/imageAvatar"
+ android:orientation="vertical">
-
-
-
-
-
-
-
-
+ android:orientation="horizontal">
+ android:text="@string/repoName"
+ android:textColor="@color/white"
+ android:textSize="18sp" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f36475a1..7a4d8757 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -427,6 +427,9 @@
Filter
+ Issue URL kopieren
+ Issue URL copied to clipboard
+
OK
Fertig
@@ -447,7 +450,6 @@
Website
Standort
maximal 255 Zeichen
- Issue Url kopieren
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 54c4d67d..bbf5c35d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -427,6 +427,9 @@
Filter
+ Copier l Issue URL
+ Issue URL copied to clipboard
+
OK
Done
@@ -448,7 +451,6 @@
Location
Ouvrir avec le Browser
Max 255 characters
- Copier l Issue Url
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 48f47a57..0dfd92ec 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -427,6 +427,9 @@
Filter
+ Copy Issue URL
+ Issue URL copied to clipboard
+
OK
Готово
@@ -448,7 +451,6 @@
Место расположения
Открыть с помощью браузера
Max 255 characters
- Copy Issue Url
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b0d669a..a919bb51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -464,6 +464,9 @@
Filter
+ Copy Issue URL
+ Issue URL copied to clipboard
+
OK
Done
@@ -488,7 +491,6 @@
Location
Max 255 characters
All fields are required
- Copy Issue Url