update the addRepoActivity ,the repo name can be filled or not

CaptainHuangsh · CaptainHuangsh · commit ee1a7771024b · 2017-08-29T16:59:45.000+08:00
diff --git a/app/src/main/java/com/loopeer/codereader/ui/activity/AddRepoActivity.java b/app/src/main/java/com/loopeer/codereader/ui/activity/AddRepoActivity.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.widget.Button;
 import android.widget.EditText;
 
@@ -11,6 +12,7 @@
 import com.loopeer.codereader.ui.view.AddRepoChecker;
 import com.loopeer.codereader.ui.view.Checker;
 import com.loopeer.codereader.ui.view.TextWatcherImpl;
+import com.loopeer.codereader.utils.DownloadUrlParser;
 import com.loopeer.codereader.utils.FileCache;
 
 import butterknife.BindView;
@@ -60,13 +62,21 @@ public void check(boolean b) {
     public void onClick() {
         hideSoftInputMethod();
 
-        Repo repo = new Repo(
-                mAddRepoChecker.repoName.trim()
-                , FileCache.getInstance().getRepoAbsolutePath(mAddRepoChecker.repoName)
-                , mAddRepoChecker.repoDownloadUrl.trim()
-                , true
-                , 0);
-        Navigator.startDownloadNewRepoService(this, repo);
+        if (TextUtils.isEmpty(mAddRepoChecker.repoName)) {
+            //未填写文件名则默认为项目原名
+            if (!TextUtils.isEmpty(mAddRepoChecker.repoDownloadUrl.trim())
+                    && !DownloadUrlParser.parseGithubUrlAndDownload(AddRepoActivity.this, mAddRepoChecker.repoDownloadUrl.trim())) {
+                showMessage(getString(R.string.repo_download_url_parse_error));
+            }
+        } else {
+            Repo repo = new Repo(
+                    mAddRepoChecker.repoName.trim()
+                    , FileCache.getInstance().getRepoAbsolutePath(mAddRepoChecker.repoName)
+                    , mAddRepoChecker.repoDownloadUrl.trim()
+                    , true
+                    , 0);
+            Navigator.startDownloadNewRepoService(this, repo);
+        }
 //        this.finish();
 
     }
diff --git a/app/src/main/java/com/loopeer/codereader/ui/activity/MainActivity.java b/app/src/main/java/com/loopeer/codereader/ui/activity/MainActivity.java
@@ -40,12 +40,10 @@
 
 public class MainActivity extends BaseActivity {
     private static final String TAG = "MainActivity";
-    //TODO 下载项目的逻辑 kt版下载了两种
     //TODO 7.0fab动画
     //TODO 7.0不能解压
     //TODO 8.0不能下载
     //TODO 文件状态识别出错
-    //TODO 下载页面的下载链接检查和可下载链接不匹配
 
 
     public static final int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 1000;
diff --git a/app/src/main/java/com/loopeer/codereader/ui/view/AddRepoChecker.java b/app/src/main/java/com/loopeer/codereader/ui/view/AddRepoChecker.java
@@ -22,6 +22,6 @@ public void setRepoDownloadUrl(String repoDownloadUrl) {
 
     @Override
     public boolean isEnable() {
-        return !TextUtils.isEmpty(repoName) && !TextUtils.isEmpty(repoDownloadUrl);
+        return  !TextUtils.isEmpty(repoDownloadUrl);
     }
 }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -48,7 +48,7 @@
     <string name="web_url_input_hint">请输入网址</string>
 
     <!-- add repo -->
-    <string name="add_repo_name_hint">本地项目保存名称</string>
+    <string name="add_repo_name_hint">本地项目保存名称,不填写则为默认名</string>
     <string name="add_repo_url_hint">项目的下载链接</string>
     <string name="add_repo_btn">下载</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -48,7 +48,7 @@
     <string name="web_url_input_hint">Please input url</string>
 
     <!-- add repo -->
-    <string name="add_repo_name_hint">Repo Name</string>
+    <string name="add_repo_name_hint">Repo Name，Is The Default Name If Not Input </string>
     <string name="add_repo_url_hint">Repo Download Url</string>
     <string name="add_repo_btn">Download</string>
     <string name="error_invalid_email">This email address is invalid</string>

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ public void setRepoDownloadUrl(String repoDownloadUrl) {`
`22`	`22`
`23`	`23`	`@Override`
`24`	`24`	`public boolean isEnable() {`
`25`		`- return !TextUtils.isEmpty(repoName) && !TextUtils.isEmpty(repoDownloadUrl);`
	`25`	`+ return !TextUtils.isEmpty(repoDownloadUrl);`
`26`	`26`	`}`
`27`	`27`	`}`