From 55e7a72d7579e867e0ef5aa716abce99097d16e5 Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <mohamed.dev43@gmail.com>
Date: Sun, 2 Jun 2019 17:41:14 +0000
Subject: [PATCH 1/7] Fix: Failed to resolve Toasty

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e0a0ab77..06d43775 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -44,7 +44,7 @@ FASTJSON_VERSION=1.1.46.android
 GLIDE_VERSION=4.0.0
 ROUNDED_IMAGEVIEW_VERSION=2.3.0
 CIRCLE_IMAGEVIEW_VERSION=2.1.0
-TOASTY_VERSION = 1.2.5
+TOASTY_VERSION = 1.4.2
 MATERIAL_ABOUT_VERSION = 2.2.1
 SUBMIT_BUTTON_VERSION = 1.1.2
 MATERIAL_DIALOG_VERSION = 0.9.4.5

From 271bca3ad5990011a314db72f4a825854cf9b20a Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <mohamed.dev43@gmail.com>
Date: Sun, 2 Jun 2019 17:49:25 +0000
Subject: [PATCH 2/7] Upgrade support libraries to v28

---
 app/build.gradle  | 2 +-
 gradle.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6243f744..e0fe571c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,7 +105,7 @@ dependencies {
 //    compile "com.android.support:support-annotations:${ANDROID_SUPPORT_VERSION}"
 
     implementation "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
-//    compile "com.android.support:support-v13:${ANDROID_SUPPORT_VERSION}"
+    implementation "com.android.support:support-v13:${ANDROID_SUPPORT_VERSION}"
     implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
     implementation "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
     implementation "com.android.support:design:${ANDROID_SUPPORT_VERSION}"
diff --git a/gradle.properties b/gradle.properties
index 06d43775..172f9dbd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ VERSION_CODE = 30
 VERSION_NAME = 3.0.0
 
 #library
-ANDROID_SUPPORT_VERSION = 25.4.0
+ANDROID_SUPPORT_VERSION = 28.0.0
 CONSTRAINT_VERSION = 1.0.2
 MULTIDEX_VERSION = 1.0.2
 DATAAUTOACCESS_VERSION = 1.2.8

From 9c14bb8f1da8c015a9838082534a2ab279a1897e Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <mohamed.dev43@gmail.com>
Date: Sun, 2 Jun 2019 22:56:32 +0000
Subject: [PATCH 3/7] Long press a search history record to delete it

---
 .../openhub/mvp/contract/ISearchContract.java |  1 +
 .../mvp/presenter/SearchPresenter.java        | 27 ++++++++++----
 .../openhub/ui/activity/SearchActivity.java   | 27 ++++++++++++--
 .../ui/adapter/SearchAutoCompleteAdapter.java | 36 +++++++++++++++++++
 4 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java

diff --git a/app/src/main/java/com/thirtydegreesray/openhub/mvp/contract/ISearchContract.java b/app/src/main/java/com/thirtydegreesray/openhub/mvp/contract/ISearchContract.java
index f3bab93a..f27333b9 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/mvp/contract/ISearchContract.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/mvp/contract/ISearchContract.java
@@ -24,6 +24,7 @@ interface Presenter extends IBaseContract.Presenter<ISearchContract.View>{
         SearchModel getSortModel(int page, int sortId);
         @NonNull ArrayList<String> getSearchRecordList();
         void addSearchRecord(@NonNull String record);
+        void removeSearchRecord(@NonNull String record);
     }
 
 }
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/SearchPresenter.java b/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/SearchPresenter.java
index c9776416..6775a533 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/SearchPresenter.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/SearchPresenter.java
@@ -14,6 +14,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 import javax.inject.Inject;
 
@@ -24,7 +25,8 @@
 public class SearchPresenter extends BasePresenter<ISearchContract.View>
         implements ISearchContract.Presenter {
 
-    @AutoAccess ArrayList<SearchModel> searchModels;
+    @AutoAccess
+    ArrayList<SearchModel> searchModels;
 
     @Inject
     public SearchPresenter(DaoSession daoSession) {
@@ -78,27 +80,40 @@ public ArrayList<String> getSearchRecordList() {
 
     @Override
     public void addSearchRecord(@NonNull String record) {
-        if(record.contains("$")){
+        if (record.contains("$")) {
             return;
         }
         int MAX_SEARCH_RECORD_SIZE = 30;
         ArrayList<String> recordList = getSearchRecordList();
-        if(recordList.contains(record)){
+        if (recordList.contains(record)) {
             recordList.remove(record);
         }
-        if(recordList.size() >= MAX_SEARCH_RECORD_SIZE){
+        if (recordList.size() >= MAX_SEARCH_RECORD_SIZE) {
             recordList.remove(recordList.size() - 1);
         }
         recordList.add(0, record);
         StringBuilder recordStr = new StringBuilder("");
         String lastRecord = recordList.get(recordList.size() - 1);
-        for(String str : recordList){
+        for (String str : recordList) {
             recordStr.append(str);
-            if(!str.equals(lastRecord)){
+            if (!str.equals(lastRecord)) {
                 recordStr.append("$$");
             }
         }
         PrefUtils.set(PrefUtils.SEARCH_RECORDS, recordStr.toString());
     }
 
+    @Override
+    public void removeSearchRecord(@NonNull String record) {
+        List<String> recordsList = getSearchRecordList();
+        recordsList.remove(record);
+        StringBuilder builder = new StringBuilder();
+        for (String str : recordsList) {
+            builder.append(str);
+            if (!str.equals(recordsList.get(recordsList.size() > 0 ? recordsList.size() - 1 : 0))) {
+                builder.append("$$");
+            }
+        }
+        PrefUtils.set(PrefUtils.SEARCH_RECORDS, builder.toString());
+    }
 }
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java
index 73ccfa20..24fc0b01 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java
@@ -10,12 +10,12 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SearchView;
 import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 
 import com.thirtydegreesray.dataautoaccess.annotation.AutoAccess;
@@ -29,6 +29,7 @@
 import com.thirtydegreesray.openhub.mvp.model.SearchModel;
 import com.thirtydegreesray.openhub.mvp.presenter.SearchPresenter;
 import com.thirtydegreesray.openhub.ui.activity.base.PagerActivity;
+import com.thirtydegreesray.openhub.ui.adapter.SearchAutoCompleteAdapter;
 import com.thirtydegreesray.openhub.ui.adapter.base.FragmentPagerModel;
 import com.thirtydegreesray.openhub.ui.fragment.RepositoriesFragment;
 import com.thirtydegreesray.openhub.ui.fragment.UserListFragment;
@@ -109,11 +110,31 @@ public boolean onCreateOptionsMenu(Menu menu) {
         }
         MenuItemCompat.setOnActionExpandListener(searchItem, this);
 
+        SearchAutoCompleteAdapter.OnSearchItemLongClick searchItemLongClickListener = (adapter, item) -> {
+            if (item != null) {
+                new AlertDialog.Builder(this)
+                        .setCancelable(false)
+                        .setMessage(String.format("Remove %s?", item))
+                        .setPositiveButton(android.R.string.yes, (dialog, which) -> {
+                            mPresenter.removeSearchRecord(item);
+                            adapter.clear();
+                            adapter.addAll(mPresenter.getSearchRecordList());
+                        })
+                        .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+                        .create()
+                        .show();
+            }
+        };
+
         AutoCompleteTextView autoCompleteTextView = searchView
                 .findViewById(android.support.v7.appcompat.R.id.search_src_text);
         autoCompleteTextView.setThreshold(0);
-        autoCompleteTextView.setAdapter(new ArrayAdapter<>(this,
-                R.layout.layout_item_simple_list, mPresenter.getSearchRecordList()));
+        autoCompleteTextView.setAdapter(new SearchAutoCompleteAdapter(
+                this,
+                R.layout.layout_item_simple_list,
+                mPresenter.getSearchRecordList(),
+                searchItemLongClickListener)
+        );
         autoCompleteTextView.setDropDownBackgroundDrawable(new ColorDrawable(ViewUtils.getWindowBackground(getActivity())));
         autoCompleteTextView.setOnItemClickListener((parent, view, position, id) -> {
             onQueryTextSubmit(parent.getAdapter().getItem(position).toString());
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java b/app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java
new file mode 100644
index 00000000..5416d683
--- /dev/null
+++ b/app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java
@@ -0,0 +1,36 @@
+package com.thirtydegreesray.openhub.ui.adapter;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+
+import java.util.List;
+
+public class SearchAutoCompleteAdapter extends ArrayAdapter<String> {
+
+    private OnSearchItemLongClick mLongClickListener;
+
+    public SearchAutoCompleteAdapter(@NonNull Context context, int resource,
+                                     @NonNull List<String> objects, OnSearchItemLongClick listener) {
+        super(context, resource, objects);
+        this.mLongClickListener = listener;
+    }
+
+    @NonNull
+    @Override
+    public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+        View view = super.getView(position, convertView, parent);
+        view.setOnLongClickListener((v) -> {
+            mLongClickListener.onLongClick(this, getItem(position));
+            return true;
+        });
+        return view;
+    }
+
+    public interface OnSearchItemLongClick {
+        void onLongClick(SearchAutoCompleteAdapter adapter, @Nullable String item);
+    }
+}

From aef4dc24d0635b5945df7aae437c7b1e7e8b7d32 Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <mohamed.dev43@gmail.com>
Date: Mon, 3 Jun 2019 13:22:34 +0000
Subject: [PATCH 4/7] Opening https://github.com/ via browser now opens Splash
 screen instead of Profile

---
 .../java/com/thirtydegreesray/openhub/util/AppOpener.java    | 5 ++++-
 .../java/com/thirtydegreesray/openhub/util/GitHubHelper.java | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/thirtydegreesray/openhub/util/AppOpener.java b/app/src/main/java/com/thirtydegreesray/openhub/util/AppOpener.java
index c7d2d5f9..965fbb13 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/util/AppOpener.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/util/AppOpener.java
@@ -26,6 +26,7 @@
 import com.thirtydegreesray.openhub.ui.activity.ReleaseInfoActivity;
 import com.thirtydegreesray.openhub.ui.activity.ReleasesActivity;
 import com.thirtydegreesray.openhub.ui.activity.RepositoryActivity;
+import com.thirtydegreesray.openhub.ui.activity.SplashActivity;
 import com.thirtydegreesray.openhub.ui.activity.ViewerActivity;
 
 import java.util.ArrayList;
@@ -180,7 +181,9 @@ public static void launchUrl(@NonNull Context context, @NonNull Uri uri){
             repoName = gitHubName.getRepoName();
         }
 
-        if(GitHubHelper.isUserUrl(url)){
+        if (GitHubHelper.isHomeUrl(url)) {
+            context.startActivity(new Intent(context, SplashActivity.class));
+        } else if(GitHubHelper.isUserUrl(url)){
             ProfileActivity.show((Activity) context, userName);
         } else if(GitHubHelper.isRepoUrl(url)){
             RepositoryActivity.show(context, userName, repoName);
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/util/GitHubHelper.java b/app/src/main/java/com/thirtydegreesray/openhub/util/GitHubHelper.java
index 1a72164f..c9865274 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/util/GitHubHelper.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/util/GitHubHelper.java
@@ -31,6 +31,7 @@ public class GitHubHelper {
 
     public static final Pattern REPO_FULL_NAME_PATTERN =
             Pattern.compile("([a-z]|[A-Z]|\\d|-)*/([a-z]|[A-Z]|\\d|-|\\.|_)*");
+    private static final Pattern HOME_PATTERN = Pattern.compile(GITHUB_BASE_URL_PATTERN_STR + "/");
     private static final Pattern USER_PATTERN = Pattern.compile(GITHUB_BASE_URL_PATTERN_STR
             + "/([a-z]|[A-Z]|\\d|-)*(/)?");
     private static final Pattern REPO_PATTERN = Pattern.compile(GITHUB_BASE_URL_PATTERN_STR
@@ -89,6 +90,10 @@ public static String getExtension(@Nullable String name) {
         return MimeTypeMap.getFileExtensionFromUrl(name);
     }
 
+    public static boolean isHomeUrl(@NonNull String url) {
+        return HOME_PATTERN.matcher(url).matches();
+    }
+
     public static boolean isUserUrl(@NonNull String url){
         return USER_PATTERN.matcher(url).matches();
     }

From e63ae56abbcf31278fbf373d44f15f879cf6c2d3 Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <mohamed.dev43@gmail.com>
Date: Mon, 3 Jun 2019 16:26:27 +0000
Subject: [PATCH 5/7] Fix UI issues throughout the app with devices with notch
 or display cutout

---
 .../openhub/ui/activity/MainActivity.java        | 16 ++++++++++++----
 .../openhub/ui/activity/ProfileActivity.java     | 11 +++++++++++
 .../main/res/layout/activity_issue_detail.xml    |  4 ++--
 app/src/main/res/layout/activity_profile.xml     |  6 +++---
 app/src/main/res/layout/activity_repository.xml  |  7 ++++---
 app/src/main/res/layout/nav_header_main.xml      |  2 +-
 6 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/MainActivity.java b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/MainActivity.java
index 582cf75d..bc11e6dd 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/MainActivity.java
@@ -9,6 +9,7 @@
 import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.AppCompatImageView;
 import android.support.v7.widget.Toolbar;
@@ -168,11 +169,18 @@ protected void initView(Bundle savedInstanceState) {
         }
         navViewStart.setCheckedItem(selectedPage);
 
-        ImageView avatar = navViewStart.getHeaderView(0).findViewById(R.id.avatar);
-        TextView name = navViewStart.getHeaderView(0).findViewById(R.id.name);
-        TextView mail = navViewStart.getHeaderView(0).findViewById(R.id.mail);
+        final View navHeader = navViewStart.getHeaderView(0);
+        ViewCompat.setOnApplyWindowInsetsListener(navHeader, (v, insets) -> {
+            navHeader.setPadding(navHeader.getPaddingLeft(), insets.getSystemWindowInsetTop(),
+                    navHeader.getPaddingRight(), navHeader.getPaddingBottom());
+            return insets;
+        });
+
+        ImageView avatar = navHeader.findViewById(R.id.avatar);
+        TextView name = navHeader.findViewById(R.id.name);
+        TextView mail = navHeader.findViewById(R.id.mail);
 
-        toggleAccountBn = navViewStart.getHeaderView(0).findViewById(R.id.toggle_account_bn);
+        toggleAccountBn = navHeader.findViewById(R.id.toggle_account_bn);
         toggleAccountBn.setOnClickListener(v -> {
             toggleAccountLay();
         });
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/ProfileActivity.java b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/ProfileActivity.java
index 05035bf0..4cf5d24b 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/ProfileActivity.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/ProfileActivity.java
@@ -9,9 +9,11 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewCompat;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -129,6 +131,15 @@ protected void initView(Bundle savedInstanceState) {
         setToolbarBackEnable();
         setToolbarTitle(mPresenter.getLoginId());
         setUserAvatar();
+        if (toolbar != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(toolbar, (v, insets) -> {
+                ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams)
+                        toolbar.getLayoutParams();
+                params.topMargin = insets.getSystemWindowInsetTop();
+                toolbar.setLayoutParams(params);
+                return insets;
+            });
+        }
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 7a0c621d..9d0bc0d8 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -26,7 +26,7 @@
             app:collapsedTitleGravity="start"
             app:expandedTitleGravity="top"
             app:expandedTitleMarginStart="96dp"
-            app:expandedTitleMarginTop="60dp"
+            app:expandedTitleMarginTop="56dp"
             app:expandedTitleTextAppearance="@style/Toolbar.Expand.TitleText"
             android:paddingTop="0dp"
             android:paddingBottom="@dimen/spacing_normal">
@@ -37,7 +37,7 @@
                 android:layout_gravity="start|top"
                 android:paddingStart="@dimen/spacing_normal"
                 android:paddingEnd="@dimen/spacing_normal"
-                android:layout_marginTop="86dp">
+                android:paddingTop="?attr/actionBarSize">
 
                 <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/user_avatar"
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 05aa0c47..9362aee3 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -28,7 +28,7 @@
             app:collapsedTitleGravity="start"
             app:expandedTitleGravity="top"
             app:expandedTitleMarginStart="96dp"
-            app:expandedTitleMarginTop="60dp"
+            app:expandedTitleMarginTop="56dp"
             app:expandedTitleTextAppearance="@style/Toolbar.Expand.TitleText"
             android:paddingTop="0dp">
 
@@ -51,11 +51,11 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="start|top"
+                android:layout_gravity="start"
                 android:paddingStart="@dimen/spacing_normal"
                 android:paddingEnd="@dimen/spacing_normal"
                 android:paddingBottom="@dimen/spacing_normal"
-                android:layout_marginTop="86dp">
+                android:paddingTop="?attr/actionBarSize">
 
                 <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/user_avatar"
diff --git a/app/src/main/res/layout/activity_repository.xml b/app/src/main/res/layout/activity_repository.xml
index d9333a80..bcd737c2 100644
--- a/app/src/main/res/layout/activity_repository.xml
+++ b/app/src/main/res/layout/activity_repository.xml
@@ -28,7 +28,7 @@
             app:collapsedTitleGravity="start"
             app:expandedTitleGravity="top"
             app:expandedTitleMarginStart="@dimen/spacing_x_large"
-            app:expandedTitleMarginTop="60dp"
+            app:expandedTitleMarginTop="56dp"
             app:expandedTitleTextAppearance="@style/Toolbar.Expand.TitleText"
             android:paddingTop="0dp">
 
@@ -49,13 +49,14 @@
                 android:fitsSystemWindows="true"/>
 
             <RelativeLayout
+                android:id="@+id/repo_info_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="start|top"
+                android:layout_gravity="start"
                 android:paddingStart="@dimen/spacing_normal"
                 android:paddingEnd="@dimen/spacing_normal"
                 android:paddingBottom="@dimen/spacing_normal"
-                android:layout_marginTop="86dp">
+                android:paddingTop="?attr/actionBarSize">
 
                 <TextView
                     android:id="@+id/desc"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 5aa63948..827ec780 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -3,7 +3,7 @@
     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="@dimen/nav_header_height"
+    android:layout_height="wrap_content"
     android:background="@drawable/side_nav_bar"
     android:gravity="bottom"
     android:orientation="vertical"

From ab2ca8a781f74eb13c5d835e63ce62051aafcd33 Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <mohamed.dev43@gmail.com>
Date: Mon, 3 Jun 2019 16:42:37 +0000
Subject: [PATCH 6/7] Fix clicking on a search history record does not search
 for it

---
 .../openhub/ui/activity/SearchActivity.java          |  6 ++----
 .../ui/adapter/SearchAutoCompleteAdapter.java        | 12 ++++++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java
index 24fc0b01..54144190 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/SearchActivity.java
@@ -133,12 +133,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
                 this,
                 R.layout.layout_item_simple_list,
                 mPresenter.getSearchRecordList(),
-                searchItemLongClickListener)
+                searchItemLongClickListener,
+                this::onQueryTextSubmit)
         );
         autoCompleteTextView.setDropDownBackgroundDrawable(new ColorDrawable(ViewUtils.getWindowBackground(getActivity())));
-        autoCompleteTextView.setOnItemClickListener((parent, view, position, id) -> {
-            onQueryTextSubmit(parent.getAdapter().getItem(position).toString());
-        });
 
         return super.onCreateOptionsMenu(menu);
     }
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java b/app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java
index 5416d683..352a17a7 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/ui/adapter/SearchAutoCompleteAdapter.java
@@ -11,18 +11,22 @@
 
 public class SearchAutoCompleteAdapter extends ArrayAdapter<String> {
 
+    private OnSearchItemClick mClickListener;
     private OnSearchItemLongClick mLongClickListener;
 
     public SearchAutoCompleteAdapter(@NonNull Context context, int resource,
-                                     @NonNull List<String> objects, OnSearchItemLongClick listener) {
+                                     @NonNull List<String> objects, OnSearchItemLongClick longClickListener,
+                                     OnSearchItemClick clickListener) {
         super(context, resource, objects);
-        this.mLongClickListener = listener;
+        this.mClickListener = clickListener;
+        this.mLongClickListener = longClickListener;
     }
 
     @NonNull
     @Override
     public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
         View view = super.getView(position, convertView, parent);
+        view.setOnClickListener((v) -> mClickListener.onClick(getItem(position)));
         view.setOnLongClickListener((v) -> {
             mLongClickListener.onLongClick(this, getItem(position));
             return true;
@@ -30,6 +34,10 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
         return view;
     }
 
+    public interface OnSearchItemClick {
+        void onClick(@Nullable String item);
+    }
+
     public interface OnSearchItemLongClick {
         void onLongClick(SearchAutoCompleteAdapter adapter, @Nullable String item);
     }

From 6ec023a8eecbf0158dbe4ffbd05ae6dd51d8c47d Mon Sep 17 00:00:00 2001
From: JoanVC100 <jojovica2001@gmail.com>
Date: Tue, 25 Jun 2019 02:13:08 +0200
Subject: [PATCH 7/7] Updating Gradle to 5.4.1, updating most of the
 dependencies to the last version available and adding Catalan language

---
 app/build.gradle                         |   6 +-
 app/src/main/res/values-ca/strings.xml   | 432 +++++++++++++++++++++++
 app/src/main/res/values/arrays.xml       |   4 +-
 gradle.properties                        |  20 +-
 gradle/wrapper/gradle-wrapper.properties |   4 +-
 5 files changed, 450 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/values-ca/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 6243f744..f6933f9d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -97,7 +97,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
@@ -105,7 +105,7 @@ dependencies {
 //    compile "com.android.support:support-annotations:${ANDROID_SUPPORT_VERSION}"
 
     implementation "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
-//    compile "com.android.support:support-v13:${ANDROID_SUPPORT_VERSION}"
+    implementation "com.android.support:support-v13:${ANDROID_SUPPORT_VERSION}"
     implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
     implementation "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
     implementation "com.android.support:design:${ANDROID_SUPPORT_VERSION}"
@@ -172,4 +172,4 @@ dependencies {
     implementation "com.timehop.stickyheadersrecyclerview:library:${STICKY_HEAD_VERSION}"
 
     implementation "org.jsoup:jsoup:${JSOUP_VERSION}"
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
new file mode 100644
index 00000000..f6bbb350
--- /dev/null
+++ b/app/src/main/res/values-ca/strings.xml
@@ -0,0 +1,432 @@
+<resources>
+    <!-- onLoginClick -->
+    <string name="user_name">Usuari</string>
+    <string name="password">Contrasenya</string>
+    <string name="login">Iniciar sessió</string>
+    <string name="login_in_browser">INICI DE SESSIÓ AL NAVEGADOR</string>
+    <string name="oauth_tip">INICIÏ SESSIÓ amb el seu navegador per defecte(OAuth)</string>
+    <string name="user_name_warning">Usuari incorrecte!</string>
+    <string name="password_warning">Contrasenya incorrecta!</string>
+
+    <!-- menu -->
+    <string name="profile">Perfil</string>
+    <string name="notifications">Notificacions</string>
+    <string name="news">Notícies</string>
+    <string name="issues">Issues</string>
+
+    <string name="repositories">Repositoris</string>
+    <string name="owned">En propietat</string>
+    <string name="starred">Destacats</string>
+    <string name="trending">En tendència</string>
+    <string name="explore">Explorar</string>
+
+    <string name="info_and_repositories">Informació &#038; Preferències</string>
+    <string name="settings">Preferències</string>
+    <string name="about">Sobre</string>
+
+    <string name="public_repositories">Repositoris públics</string>
+    <string name="starred_repositories">Repositoris en tendència</string>
+
+    <string name="no_cache_and_network">La caché i la xarxa no estàn disponibles.</string>
+    <string name="page_no_found">Page not found.</string>
+    <string name="unauthorized">Unauthorized.</string>
+    <string name="no_network_tip">Loading data from GitHub failed. Please check your network connection and retry.</string>
+    <string name="load_timeout_tip">Loading data from GitHub timed out. Please check your network connection and retry.</string>
+    <string name="tap_to_retry">Tap to retry</string>
+    <string name="no_data">No data</string>
+
+    <string name="title_activity_repository">OpenHub</string>
+    <string name="title_activity_settings">Settings</string>
+
+    <!-- Strings related to Settings -->
+
+    <!-- settings -->
+    <string name="choose_theme">Choose Theme</string>
+    <string name="theme_accent_color">Theme Accent Color</string>
+    <string name="start_page">Start Page</string>
+    <string name="cache_controller">Cache Controller</string>
+    <string name="cache_controller_desc">Load cache first if cache available, then load from network</string>
+    <string name="use_system_downloader">Use System Downloader</string>
+    <string name="use_custom_tabs">Use Custom Tabs</string>
+    <string name="custom_tabs_desc">Open in custom tabs instead of outer browser(support chrome, firefox…)</string>
+    <string name="use_custom_tabs_tips">If you want to open in outer browser directly, you could change in settings.</string>
+    <string name="language">Language</string>
+    <string name="logout">Logout</string>
+
+    <!-- Repository -->
+    <string name="repository">Repository</string>
+    <string name="info">Info</string>
+    <string name="files">Files</string>
+    <string name="commits">Commits</string>
+    <string name="commit">Commit</string>
+
+    <string name="star">Star</string>
+    <string name="unstar">Unstar</string>
+    <string name="unstarred">Unstarred</string>
+    <string name="branch_tip">Branches or tags</string>
+    <string name="share">Share</string>
+    <string name="open_in_browser">Open in browser</string>
+    <string name="copy_url">Copy URL</string>
+    <string name="copy_clone_url">Copy clone URL</string>
+    <string name="watch">Watch</string>
+    <string name="watched">Watched</string>
+    <string name="unwatch">Unwatch</string>
+    <string name="unwatched">Unwatched</string>
+    <string name="fork">Fork</string>
+    <string name="fork_tag">Fork</string>
+    <string name="forked">Forked</string>
+    <string name="forked_from">Forked from</string>
+    <string name="wrap_lines">Wrap lines</string>
+    <string name="refresh">Refresh</string>
+
+    <string name="success_copied">Copied</string>
+
+    <string name="stargazers">Stargazers</string>
+    <string name="forks">Forks</string>
+    <string name="watchers">Watchers</string>
+    <string name="readme">README</string>
+    <string name="no_readme">NO README</string>
+    <string name="warning_dialog_tile">Warning</string>
+    <string name="cancel">Cancel</string>
+    <string name="close">Close</string>
+    <string name="ok">OK</string>
+    <string name="confirm">OK</string>
+    <string name="select_branch">Select branch or tag</string>
+    <string name="share_to">Share to</string>
+    <string name="no_share_clients">There are no share clients installed.</string>
+    <string name="no_browser_clients">There are no browser clients installed.</string>
+    <string name="no_download_clients">There are no download clients installed.</string>
+    <string name="send_email">Send email</string>
+    <string name="open_in_market">Open in market</string>
+    <string name="no_email_clients">There are no email clients installed.</string>
+    <string name="no_market_clients">There are no market clients installed.</string>
+    <string name="url_invalid">Url is invalid</string>
+    <string name="view_archive_file_error">Archive file is not supported, please download the file to view its content.</string>
+    <string name="fork_warning_msg">Fork this repository?</string>
+    <string name="invalid_repo_url">Invalid repository url!</string>
+    <string name="invalid_url">Invalid url!</string>
+
+    <!-- Profile -->
+    <string name="follow">Follow</string>
+    <string name="followed">Followed</string>
+    <string name="unfollow">Unfollow</string>
+    <string name="unfollowed">Unfollowed</string>
+    <string name="members">Members</string>
+    <string name="view">View</string>
+    <string name="followers">Followers</string>
+    <string name="following">Following</string>
+    <string name="repos">Repos</string>
+    <string name="stars">Stars</string>
+    <string name="gists">Gists</string>
+    <string name="joined_at">Joined at</string>
+    <string name="users">Users</string>
+    <string name="activity">Activity</string>
+
+    <string name="just_now">just now</string>
+    <string name="seconds_ago">seconds ago</string>
+    <string name="minutes_ago">minutes ago</string>
+    <string name="hours_ago">hours ago</string>
+    <string name="days_ago">days ago</string>
+
+    <string name="search">Search</string>
+    <string name="sort">Sort</string>
+    <string name="sort_order">Sort order</string>
+
+    <string name="best_match">Best match</string>
+    <string name="most_stars">Most stars</string>
+    <string name="fewest_stars">Fewest stars</string>
+    <string name="most_forks">Most forks</string>
+    <string name="fewest_forks">Fewest forks</string>
+    <string name="recently_updated">Recently updated</string>
+    <string name="least_recently_updated">Least recently updated</string>
+
+    <string name="most_followers">Most followers</string>
+    <string name="fewest_followers">Fewest followers</string>
+    <string name="most_recently_joined">Most recently joined</string>
+    <string name="least_recently_joined">Least recently joined</string>
+    <string name="most_repositories">Most repositories</string>
+    <string name="fewest_repositories">Fewest repositories</string>
+
+    <string name="invalid_query">Invalid query text!</string>
+
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+
+    <string name="logout_warning">Confirm to logout?</string>
+    <string name="unknown">Unknown</string>
+    <string name="organizations">Organizations</string>
+    <string name="no_user">No users</string>
+    <string name="no_activity">No activities</string>
+    <string name="no_repository">No repositories</string>
+    <string name="no_file">No files</string>
+    <string name="developing">Developing</string>
+    <string name="version" >Version</string>
+    <string name="source_code" >Source code</string>
+    <string name="source_code_wishes" >Star to support me</string>
+    <string name="rate_in_market" >Rate or comment in market</string>
+    <string name="author" >Author</string>
+    <string name="follow_on_github" >Follow on GitHub</string>
+    <string name="email" >Email</string>
+    <string name="loading">loading</string>
+
+    <string name="upgrade">Upgrade</string>
+    <string name="install">Install</string>
+    <string name="next_time">Next time</string>
+    <string name="upgrade_version">Version:</string>
+    <string name="upgrade_apk_size">Apk size:</string>
+    <string name="publish_time">Publish time:</string>
+    <string name="upgrade_info">Upgrade info:</string>
+    <string name="no_upgrade_tip">You have installed the latest version.</string>
+    <string name="fork_failed">Fork failed</string>
+
+    <string name="filter">Filter</string>
+
+    <string name="releases">Releases</string>
+    <string name="no_releases">No releases</string>
+    <string name="source_code_zip">Source code (zip)</string>
+    <string name="source_code_tar">Source code (tar.gz)</string>
+    <string name="download_source_zip">Download source (zip)</string>
+    <string name="download_source_tar">Download source (tar.gz)</string>
+    <string name="released_this">released this</string>
+    <string name="on">on</string>
+    <string name="download">Download</string>
+    <string name="download_complete">Download complete</string>
+    <string name="download_failed">Download failed</string>
+    <string name="downloading">Downloading</string>
+    <string name="download_empty_tip">Url or file name is empty!</string>
+    <string name="download_start">Download start</string>
+    <string name="download_cancel">Download cancel</string>
+    <string name="permission_storage_denied">Permission denied, please allow storage permission.</string>
+    <string name="enable_download_service_tip">Please enable download service first!</string>
+
+    <string name="open">Open</string>
+    <string name="closed">Closed</string>
+    <string name="no_issues">No issues</string>
+    <string name="issue">Issue</string>
+
+    <string name="type">Type</string>
+    <string name="all">All</string>
+    <string name="created">Created</string>
+    <string name="assigned">Assigned</string>
+    <string name="mentioned">Mentioned</string>
+    <string name="participating">Participant</string>
+
+    <string name="recently_created">Recently created</string>
+    <string name="previously_created">Previously created</string>
+    <string name="most_comments">Most comments</string>
+    <string name="fewest_comments">Fewest comments</string>
+
+    <string name="comments">Comments</string>
+    <string name="comment">Comment</string>
+    <string name="no_description">No description provided.</string>
+    <string name="no_comments">No comments.</string>
+
+    <string name="write">Write</string>
+    <string name="preview">Preview</string>
+
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="comment_null_warning">Comment is null!</string>
+    <string name="comment_success">Comment success</string>
+    <string name="delete_comment_warning">Confirm to delete comment?</string>
+    <string name="reopen">Reopen</string>
+    <string name="reopen_success">Reopen success</string>
+    <string name="close_success">Close success</string>
+
+    <string name="add_large_header">Add large header</string>
+    <string name="add_medium_header">Add medium header</string>
+    <string name="add_small_header">Add small header</string>
+    <string name="add_bold_text">Add bold text</string>
+    <string name="add_italic_text">Add italic text</string>
+    <string name="add_a_link">Add a link</string>
+    <string name="insert_code">Insert code</string>
+    <string name="insert_a_quote">Insert a quote</string>
+    <string name="add_a_bulleted_list">Add a bulleted list</string>
+    <string name="mention">Directly mention a user or team</string>
+    <string name="nothing_to_preview">Nothing to preview</string>
+
+    <string name="title">Title</string>
+    <string name="leave_a_comment">Leave a comment</string>
+    <string name="markdown_editor">Use markdown editor</string>
+
+    <string name="created_at">Created at</string>
+    <string name="forked_at">Forked at</string>
+    <string name="latest_update">Latest update</string>
+    <string name="latest_commit">Latest commit</string>
+    <string name="issue_title_null_tip">Issue title can not be null.</string>
+    <string name="edit_issue">Edit issue</string>
+    <string name="create_issue">Create issue</string>
+    <string name="edit_issue_success">Edit issue success</string>
+    <string name="create_issue_success">Create issue success</string>
+
+    <string name="no_commits">No commits</string>
+    <string name="committed">Committed</string>
+    <string name="view_file">View file</string>
+    <string name="failed_to_recognize">Failed to recognize the GitHub URL, please open in browser after long press copied.</string>
+    <string name="failed_to_open_url">Failed to open the URL, please open in browser after long press copied.</string>
+    <string name="compare">Compare view</string>
+
+    <string name="unread">Unread</string>
+    <string name="no_notifications_tip">No new notifications.</string>
+    <string name="feedback_and_share">Share &#038; Feedback</string>
+    <string name="share_to_friends">Share to your friends</string>
+    <string name="feedback">Feedback</string>
+
+    <string name="openhub_wishes">Wishes From OpenHub</string>
+    <string name="star_wishes" formatted="false"> Hi %s, today is your %dth day at OpenHub, thanks for your using, I will strive to become a more convenient GitHub app for you. \n\nIf you can star to support me, it would be awesome!</string>
+    <string name="star_thanks">Thank you for your support!</string>
+    <string name="star_me">Star me</string>
+    <string name="star_next_time">Keep moving</string>
+
+    <string name="owner_repo">Owner</string>
+    <string name="public_repo">Public</string>
+    <string name="private_repo">Private</string>
+    <string name="member_repo">Member</string>
+    <string name="most_pushed">Most pushed</string>
+    <string name="fewest_pushed">Fewest pushed</string>
+    <string name="full_name_asc">Full name asc</string>
+    <string name="full_name_desc">Full name desc</string>
+    <string name="recently_starred">Recently starred</string>
+    <string name="previously_starred">Previously starred</string>
+
+    <string name="trace">Trace</string>
+    <string name="my_repos">My repos</string>
+    <string name="starred_repos">Starred repos</string>
+    <string name="trending_repos">Trending repos</string>
+
+    <string name="bookmarks">Bookmarks</string>
+    <string name="bookmark">Bookmark</string>
+    <string name="remove_bookmark">Remove bookmark</string>
+    <string name="bookmark_saved">Bookmark saved</string>
+    <string name="bookmark_removed">Bookmark removed</string>
+
+    <string name="user">User</string>
+    <string name="repo">Repo</string>
+    <string name="issues_list">Issues list</string>
+    <string name="commits_list">Commits list</string>
+    <string name="releases_list">Releases list</string>
+    <string name="release">Release</string>
+    <string name="go_to">Go to</string>
+
+    <string name="tips">Tips</string>
+    <string name="activity_click_tip">You can single click item to view default page, or long click item to view available pages.
+    </string>
+    <string name="double_click_toolbar_tip">You can double click title to back top in list page.</string>
+    <string name="releases_click_tip">You can long click item to view available downloads.</string>
+
+    <string name="created_comment_on_commit">Created comment on commit in %s</string>
+    <string name="created_comment_on_issue">Created comment on issue %d in %s</string>
+    <string name="created_repo">Created repository %s</string>
+    <string name="forked_to">Forked %s to %s</string>
+    <string name="starred_repo">Starred %s</string>
+    <string name="push_to">Push to %s at %s</string>
+    <string name="created_tag_at">Created tag %s at %s</string>
+    <string name="created_branch_at">Created branch %s at %s</string>
+    <string name="delete_tag_at">Delete tag %s at %s</string>
+    <string name="delete_branch_at">Delete branch %s at %s</string>
+    <string name="published_release_at">Published release %s at %s</string>
+    <string name="opened_issue_at">Opened issue %d in %s</string>
+    <string name="closed_issue_at">Closed issue %d in %s</string>
+    <string name="reopened_issue_at">Reopened issue %d in %s</string>
+    <string name="edited_issue_at">Edited issue %d in %s</string>
+    <string name="assigned_issue_at">Assigned issue %d in %s</string>
+    <string name="unassigned_issue_at">Unassigned issue %d in %s</string>
+    <string name="labeled_issue_at">Labeled issue %d in %s</string>
+    <string name="unlabeled_issue_at">Unlabeled issue %d in %s</string>
+    <string name="milestoned_issue_at">Milestoned issue %d in %s</string>
+    <string name="demilestoned_issue_at">Demilestoned issue %d in %s</string>
+    <string name="added_member_to">Added member %s to %s</string>
+    <string name="deleted_member_at">Deleted member %s at %s</string>
+    <string name="edited_member_at">Edited member %s at %s</string>
+    <string name="made_repo_public">Made %s public</string>
+    <string name="org_blocked_user">Org %s blocked user %s</string>
+    <string name="org_unblocked_user">Org %s unblocked user %s</string>
+    <string name="created_pull_request_comment_at">Created pull request review comment at %s</string>
+    <string name="deleted_pull_request_comment_at">Deleted pull request review comment at %s</string>
+    <string name="edited_pull_request_comment_at">Edited pull request review comment at %s</string>
+    <string name="submitted_pull_request_review_at">Submitted pull request review at %s</string>
+    <string name="edited_pull_request_review_at">Edited pull request review at %s</string>
+    <string name="dismissed_pull_request_review_at">Dismissed pull request review at %s</string>
+
+    <string name="undo">Undo</string>
+    <string name="no_bookmarks">No bookmarks</string>
+    <string name="no_trace">No trace</string>
+    <string name="trace_deleted">Trace deleted</string>
+    <string name="today">Today</string>
+    <string name="yesterday">Yesterday</string>
+
+    <string name="my_languages">My languages</string>
+    <string name="choose_languages">Choose languages</string>
+    <string name="language_removed">Language %s removed</string>
+    <string name="no_choose_language_warning">Choose at least one language!</string>
+    <string name="languages_editor_tip">You can swipe left or right to remove items, long click items to drag the sort.</string>
+    <string name="fullscreen">Fullscreen</string>
+
+    <string name="public_news">Global news</string>
+    <string name="wiki" translatable="false">Wiki</string>
+    <string name="recent_wiki_updates">Recent Wiki Updates</string>
+    <string name="no_recent_wiki_updates">No recent Wiki Updates</string>
+
+    <string name="repo_collections">Repo collections</string>
+    <string name="no_repo_collections">No repo collections</string>
+    <string name="collections_tip">Curated lists and insight into burgeoning industries, topics, and communities.</string>
+    <string name="github_page_parse_error">%s page parse error, this page may be changed by github, please update your application to latest version, if error continue, please concat me to solve the problem!
+    </string>
+
+    <string name="bookmarks_tip">You can swipe left or right to remove bookmark.</string>
+    <string name="mark_all_as_read">Mark all as read</string>
+    <string name="mark_as_read">Mark as read</string>
+
+    <string name="topic">Topic</string>
+    <string name="topics">Featured topics</string>
+    <string name="topics_tip">Browse the top used topics on GitHub.</string>
+    <string name="no_topics">No topics</string>
+
+    <string name="star_num_today">%s star today</string>
+    <string name="star_num_this_week">%s star this week</string>
+    <string name="star_num_this_month">%s star this month</string>
+    <string name="no_trending_repos">It looks like we don’t have any trending repositories for %s.</string>
+
+    <string name="all_languages">All languages</string>
+    <string name="unknown_languages">Unknown languages</string>
+
+    <string name="labels">Labels</string>
+    <string name="label">Label</string>
+    <string name="edit_label">Edit label</string>
+    <string name="create_label">Create label</string>
+    <string name="save">Save</string>
+    <string name="name">Name</string>
+    <string name="color">Color</string>
+    <string name="more">More</string>
+    <string name="custom">Custom</string>
+    <string name="done">Done</string>
+    <string name="presets">Presets</string>
+    <string name="choose_color">Choose color</string>
+    <string name="invalid_color">Invalid color</string>
+    <string name="invalid_name">Invalid name</string>
+    <string name="choose_labels">Choose labels</string>
+    <string name="manage_labels">Manage labels</string>
+
+    <string name="issue_add_label">add the label %s</string>
+    <string name="issue_remove_label">remove the label %s</string>
+    <string name="issue_close">close this</string>
+    <string name="issue_reopened">reopened this</string>
+    <string name="issue_modified">modified this issue</string>
+    <string name="issue_added_to_milestone">added this to the %s milestone</string>
+    <string name="issue_removed_from_milestone">removed this from the %s milestone</string>
+    <string name="issue_locked_conversation">locked and limited conversation to collaborators</string>
+    <string name="issue_unlocked_conversation">unlocked this conversation</string>
+    <string name="issue_delete_comment">delete a comment</string>
+    <string name="issue_referenced">referenced this issue in %s</string>
+    <string name="issue_assigned">assigned this to %s</string>
+    <string name="issue_unassigned">removed their assignment</string>
+
+    <string name="disable_loading_image">Disable loading network image</string>
+    <string name="disable_loading_image_desc">Disable loading network image while mobile network</string>
+
+    <string name="toggle_issue_warning">Confirm to %s this issue?</string>
+
+    <string name="add_account">Add account</string>
+    <string name="delete_label_warning">Confirm to delete this label?</string>
+</resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index bc4b2f27..e0a911a9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -9,16 +9,18 @@
         <item>Português</item>
         <item>한국어</item>
         <item>Español</item>
+        <item>Català</item>
     </array>
     <array name="language_id_array">
         <item>en</item>
         <item>zh-rCN</item>
         <item>iw</item>
         <item>de</item>
+        <item>es</item>
         <item>hi</item>
         <item>pt-rPT</item>
         <item>ko</item>
-        <item>es</item>
+        <item>ca</item>
     </array>
 
     <array name="accent_color_array">
diff --git a/gradle.properties b/gradle.properties
index e0a0ab77..19251a2d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,30 +26,30 @@ VERSION_CODE = 30
 VERSION_NAME = 3.0.0
 
 #library
-ANDROID_SUPPORT_VERSION = 25.4.0
-CONSTRAINT_VERSION = 1.0.2
+ANDROID_SUPPORT_VERSION = 28.0.0
+CONSTRAINT_VERSION = 1.1.3
 MULTIDEX_VERSION = 1.0.2
 DATAAUTOACCESS_VERSION = 1.2.8
-BUTTERKNIFE_VERSION = 8.7.0
+BUTTERKNIFE_VERSION = 9.0.0
 GREEN_DAO_VERSION=3.2.2
 EVENT_BUS_VERSION=3.0.0
 FILE_DOWNLOADER_VERSION=0.3.1
 RXJAVA_VERSION=1.1.0
-RETROFIT_VERSION=2.1.0
-DAGGER_VERSION=2.11
-RX_PERMISSION_VERSION=0.9.4@aar
+RETROFIT_VERSION=2.6.0
+DAGGER_VERSION=2.23.2
+RX_PERMISSION_VERSION=0.9.4
 RETROLAMBDA_VERSION=2.3.0
 OKHTTP_VERSION=3.6.0
 FASTJSON_VERSION=1.1.46.android
 GLIDE_VERSION=4.0.0
 ROUNDED_IMAGEVIEW_VERSION=2.3.0
-CIRCLE_IMAGEVIEW_VERSION=2.1.0
-TOASTY_VERSION = 1.2.5
+CIRCLE_IMAGEVIEW_VERSION=3.0.0
+TOASTY_VERSION = 1.4.2
 MATERIAL_ABOUT_VERSION = 2.2.1
 SUBMIT_BUTTON_VERSION = 1.1.2
 MATERIAL_DIALOG_VERSION = 0.9.4.5
 BUGGLY_NATIVE_VERSION = 3.3.1
 RICKTEXT_VERSION = 2.5.4
-LOGGER_VERSION = 2.1.1
+LOGGER_VERSION = 2.2.0
 STICKY_HEAD_VERSION = 0.4.3
-JSOUP_VERSION = 1.11.2
\ No newline at end of file
+JSOUP_VERSION = 1.12.1
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b577e43b..5ffb377d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 05 11:42:12 CST 2018
+#Mon Jun 24 22:19:45 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip