From ed0dadeedf68cf9672133bb78d597f64fb70c210 Mon Sep 17 00:00:00 2001
From: 13372038054 <550906320@qq.com>
Date: Tue, 5 Sep 2017 11:58:19 +0800
Subject: [PATCH] optimize for V1.0.0

---
 .../thirtydegreesray/openhub/mvp/model/NameParser.java    | 1 -
 .../openhub/mvp/presenter/RepositoryPresenter.java        | 2 +-
 .../openhub/ui/activity/AboutActivity.java                | 8 ++++----
 .../res/{drawable-v20 => drawable}/ic_explore_title.xml   | 0
 app/src/main/res/{drawable-v20 => drawable}/ic_fork.xml   | 0
 .../main/res/{drawable-v20 => drawable}/ic_info_title.xml | 0
 .../main/res/{drawable-v20 => drawable}/ic_menu_about.xml | 0
 .../res/{drawable-v20 => drawable}/ic_menu_explore.xml    | 0
 .../main/res/{drawable-v20 => drawable}/ic_menu_gists.xml | 0
 .../res/{drawable-v20 => drawable}/ic_menu_issues.xml     | 0
 .../main/res/{drawable-v20 => drawable}/ic_menu_news.xml  | 0
 .../{drawable-v20 => drawable}/ic_menu_notifications.xml  | 0
 .../res/{drawable-v20 => drawable}/ic_menu_person.xml     | 0
 .../main/res/{drawable-v20 => drawable}/ic_menu_repo.xml  | 0
 .../res/{drawable-v20 => drawable}/ic_menu_settings.xml   | 0
 .../main/res/{drawable-v20 => drawable}/ic_menu_star.xml  | 0
 .../res/{drawable-v20 => drawable}/ic_menu_trending.xml   | 0
 .../main/res/{drawable-v20 => drawable}/ic_refresh.xml    | 0
 .../res/{drawable-v20 => drawable}/ic_refresh_dark.xml    | 0
 .../res/{drawable-v20 => drawable}/ic_refresh_title.xml   | 0
 app/src/main/res/{drawable-v20 => drawable}/ic_watch.xml  | 0
 .../main/res/{drawable-v20 => drawable}/shape_line.xml    | 0
 app/src/main/res/values-zh-rCN/strings.xml                | 1 +
 app/src/main/res/values/strings.xml                       | 5 ++++-
 app/src/main/res/values/theme_dark.xml                    | 4 +++-
 app/src/main/res/values/theme_light.xml                   | 4 +++-
 26 files changed, 16 insertions(+), 9 deletions(-)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_explore_title.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_fork.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_info_title.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_about.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_explore.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_gists.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_issues.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_news.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_notifications.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_person.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_repo.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_settings.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_star.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_menu_trending.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_refresh.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_refresh_dark.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_refresh_title.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/ic_watch.xml (100%)
 rename app/src/main/res/{drawable-v20 => drawable}/shape_line.xml (100%)

diff --git a/app/src/main/java/com/thirtydegreesray/openhub/mvp/model/NameParser.java b/app/src/main/java/com/thirtydegreesray/openhub/mvp/model/NameParser.java
index 38910fb5..53390cdf 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/mvp/model/NameParser.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/mvp/model/NameParser.java
@@ -35,7 +35,6 @@ public class NameParser {
 
     public NameParser(@Nullable String url) {
         if (!StringUtils.isBlank(url)) {
-            //FIXME enterprise judge
 //            boolean isEnterprise = LinkParserHelper.isEnterprise(url);
 //            if (isEnterprise) {
 //                url = url.replace("api/v3/", "");
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/RepositoryPresenter.java b/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/RepositoryPresenter.java
index 00a2cecc..097cc77a 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/RepositoryPresenter.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/RepositoryPresenter.java
@@ -156,7 +156,7 @@ public void onSuccess(HttpResponse<Repository> response) {
                     mView.showSuccessToast(getString(R.string.forked));
                     RepositoryActivity.show(getContext(), response.body());
                 } else {
-                    //TODO tip error
+                    mView.showErrorToast(getString(R.string.fork_failed));
                 }
                 mView.getProgressDialog(getLoadTip()).dismiss();
             }
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/AboutActivity.java b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/AboutActivity.java
index 9284303c..c2dcf73c 100644
--- a/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/AboutActivity.java
+++ b/app/src/main/java/com/thirtydegreesray/openhub/ui/activity/AboutActivity.java
@@ -72,7 +72,7 @@ protected CharSequence getActivityTitle() {
     private void buildApp(MaterialAboutCard.Builder appBuilder, final Context context){
         appBuilder.addItem(new MaterialAboutTitleItem.Builder()
                 .text(getString(R.string.app_name))
-                .desc("© 2017 ThirtyDegreesRay")
+                .desc(getString(R.string.app_copyright))
                 .icon(R.mipmap.logo)
                 .build());
         appBuilder.addItem(new MaterialAboutActionItem.Builder()
@@ -92,7 +92,7 @@ public void onClick() {
                 .setOnClickAction(new MaterialAboutItemOnClickAction() {
                     @Override
                     public void onClick() {
-                        RepositoryActivity.show(context, "ThirtyDegreesRay", "OpenHub");
+                        RepositoryActivity.show(context, getString(R.string.author_login_id), getString(R.string.app_name));
                     }
                 })
                 .build());
@@ -107,7 +107,7 @@ private void buildAuthor(MaterialAboutCard.Builder appBuilder, final Context con
                 .setOnClickAction(new MaterialAboutItemOnClickAction() {
                     @Override
                     public void onClick() {
-                        ProfileActivity.show(context, "ThirtyDegreesRay");
+                        ProfileActivity.show(context, getString(R.string.author_login_id));
                     }
                 })
                 .build());
@@ -117,7 +117,7 @@ public void onClick() {
                 .setOnClickAction(new MaterialAboutItemOnClickAction() {
                     @Override
                     public void onClick() {
-                        ProfileActivity.show(context, "ThirtyDegreesRay");
+                        ProfileActivity.show(context, getString(R.string.author_login_id));
                     }
                 })
                 .build());
diff --git a/app/src/main/res/drawable-v20/ic_explore_title.xml b/app/src/main/res/drawable/ic_explore_title.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_explore_title.xml
rename to app/src/main/res/drawable/ic_explore_title.xml
diff --git a/app/src/main/res/drawable-v20/ic_fork.xml b/app/src/main/res/drawable/ic_fork.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_fork.xml
rename to app/src/main/res/drawable/ic_fork.xml
diff --git a/app/src/main/res/drawable-v20/ic_info_title.xml b/app/src/main/res/drawable/ic_info_title.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_info_title.xml
rename to app/src/main/res/drawable/ic_info_title.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_about.xml b/app/src/main/res/drawable/ic_menu_about.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_about.xml
rename to app/src/main/res/drawable/ic_menu_about.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_explore.xml b/app/src/main/res/drawable/ic_menu_explore.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_explore.xml
rename to app/src/main/res/drawable/ic_menu_explore.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_gists.xml b/app/src/main/res/drawable/ic_menu_gists.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_gists.xml
rename to app/src/main/res/drawable/ic_menu_gists.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_issues.xml b/app/src/main/res/drawable/ic_menu_issues.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_issues.xml
rename to app/src/main/res/drawable/ic_menu_issues.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_news.xml b/app/src/main/res/drawable/ic_menu_news.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_news.xml
rename to app/src/main/res/drawable/ic_menu_news.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_notifications.xml b/app/src/main/res/drawable/ic_menu_notifications.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_notifications.xml
rename to app/src/main/res/drawable/ic_menu_notifications.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_person.xml b/app/src/main/res/drawable/ic_menu_person.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_person.xml
rename to app/src/main/res/drawable/ic_menu_person.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_repo.xml b/app/src/main/res/drawable/ic_menu_repo.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_repo.xml
rename to app/src/main/res/drawable/ic_menu_repo.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_settings.xml b/app/src/main/res/drawable/ic_menu_settings.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_settings.xml
rename to app/src/main/res/drawable/ic_menu_settings.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_star.xml b/app/src/main/res/drawable/ic_menu_star.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_star.xml
rename to app/src/main/res/drawable/ic_menu_star.xml
diff --git a/app/src/main/res/drawable-v20/ic_menu_trending.xml b/app/src/main/res/drawable/ic_menu_trending.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_menu_trending.xml
rename to app/src/main/res/drawable/ic_menu_trending.xml
diff --git a/app/src/main/res/drawable-v20/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_refresh.xml
rename to app/src/main/res/drawable/ic_refresh.xml
diff --git a/app/src/main/res/drawable-v20/ic_refresh_dark.xml b/app/src/main/res/drawable/ic_refresh_dark.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_refresh_dark.xml
rename to app/src/main/res/drawable/ic_refresh_dark.xml
diff --git a/app/src/main/res/drawable-v20/ic_refresh_title.xml b/app/src/main/res/drawable/ic_refresh_title.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_refresh_title.xml
rename to app/src/main/res/drawable/ic_refresh_title.xml
diff --git a/app/src/main/res/drawable-v20/ic_watch.xml b/app/src/main/res/drawable/ic_watch.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/ic_watch.xml
rename to app/src/main/res/drawable/ic_watch.xml
diff --git a/app/src/main/res/drawable-v20/shape_line.xml b/app/src/main/res/drawable/shape_line.xml
similarity index 100%
rename from app/src/main/res/drawable-v20/shape_line.xml
rename to app/src/main/res/drawable/shape_line.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7cade413..f6d81962 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -131,5 +131,6 @@
     <string name="publish_time">发布时间：</string>
     <string name="upgrade_info">升级信息：</string>
     <string name="no_upgrade_tip">你已经安装了最新版本</string>
+    <string name="fork_failed">添加到我的版本库失败</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b80a81a1..a240c46e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,8 +169,10 @@
     <string name="version" >Version</string>
     <string name="source_code" >Source code</string>
     <string name="author" >Author</string>
-    <string name="author_name" translatable="false">ThirtyDegreesRay</string>
+    <string name="author_name" translatable="false">Rays Yu</string>
     <string name="author_location" translatable="false">NanJing,China</string>
+    <string name="author_login_id" translatable="false">ThirtyDegreesRay</string>
+    <string name="app_copyright" translatable="false">© 2017 ThirtyDegreesRay</string>
     <string name="follow_on_github" >Follow on GitHub</string>
     <string name="email" >Email</string>
     <string name="auth_email_address" translatable="false">rays.yuz@gmail.com</string>
@@ -184,5 +186,6 @@
     <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>
 
 </resources>
diff --git a/app/src/main/res/values/theme_dark.xml b/app/src/main/res/values/theme_dark.xml
index dd4f0f57..8acb429c 100644
--- a/app/src/main/res/values/theme_dark.xml
+++ b/app/src/main/res/values/theme_dark.xml
@@ -19,7 +19,7 @@
 
     <color name="dark_color_primary">#2D3035</color>
     <color name="dark_color_primary_dark">#26282C</color>
-    <color name="dark_color_accent">@color/material_amber_accent_700</color>
+    <color name="dark_color_accent">@color/material_green_accent_700</color>
     <color name="dark_color_window_background">#22252A</color>
     <color name="dark_text_color_primary">@color/material_light_white</color>
     <color name="dark_text_color_secondary">@color/material_grey_500</color>
@@ -229,6 +229,8 @@
         <item name="mal_color_primary">@color/dark_text_color_primary</item>
         <item name="mal_color_secondary">@color/dark_text_color_secondary</item>
         <item name="mal_card_background">@color/dark_card_background</item>
+        <item name="alertDialogTheme">@style/DialogThemeDark.Green</item>
+        <item name="android:alertDialogTheme">@style/DialogThemeDark.Green</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_light.xml b/app/src/main/res/values/theme_light.xml
index 87eeffb0..dd7e02d3 100644
--- a/app/src/main/res/values/theme_light.xml
+++ b/app/src/main/res/values/theme_light.xml
@@ -19,7 +19,7 @@
 
     <color name="light_color_primary">@color/material_indigo_500</color>
     <color name="light_color_primary_dark">@color/material_indigo_700</color>
-    <color name="light_color_accent">@color/material_indigo_accent_700</color>
+    <color name="light_color_accent">@color/material_green_accent_700</color>
     <color name="light_window_background">@color/material_light_white</color>
     <color name="light_icon_color">@color/material_light_black</color>
     <color name="light_card_background">@color/material_white</color>
@@ -206,6 +206,8 @@
         <item name="mal_color_primary">@color/light_text_color_primary</item>
         <item name="mal_color_secondary">@color/light_text_color_secondary</item>
         <item name="mal_card_background">@color/light_card_background</item>
+        <item name="alertDialogTheme">@style/DialogThemeLight.Green</item>
+        <item name="android:alertDialogTheme">@style/DialogThemeLight.Green</item>
     </style>
 
 </resources>
\ No newline at end of file