Merge branch 'develop' into 'master'

qwe7002 · qwe7002 · commit 47335209aa76 · 2018-07-27T01:12:54.000+08:00
移动代码位置,修复问题

See merge request SilverBlog/SilverBlog_Android!76
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,15 +16,15 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">
         <activity
-            android:name=".main_Activity"
+            android:name="org.SilverBlog.client.main_Activity"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".post_Activity"
+            android:name="org.SilverBlog.client.post_Activity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity android:name="com.google.zxing.activity.CaptureActivity" />
         <activity
-            android:name=".post_list_card_Activity"
+            android:name="org.SilverBlog.client.post_list_card_Activity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
diff --git a/app/src/main/java/org/SilverBlog/client/FabScrollBehavior.java b/app/src/main/java/org/SilverBlog/client/FabScrollBehavior.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/org/SilverBlog/client/Post_List_Serialzable.java b/app/src/main/java/org/SilverBlog/client/Post_List_Serialzable.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 public class Post_List_Serialzable {
     private String title;
diff --git a/app/src/main/java/org/SilverBlog/client/RecyclerViewAdapter.java b/app/src/main/java/org/SilverBlog/client/RecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -7,6 +7,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.CardView;
@@ -18,6 +19,7 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.reallct.qwe7002.smartblog_client.R;
 
 import java.util.List;
 
@@ -34,14 +36,15 @@ public RecyclerViewAdapter(List<Post_List_Serialzable> post_list_serialzables, C
 
     }
 
+    @NonNull
     @Override
-    public RecyclerViewAdapter.NewsViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+    public RecyclerViewAdapter.NewsViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
         View v = LayoutInflater.from(context).inflate(R.layout.cardview, viewGroup, false);
         return new NewsViewHolder(v);
     }
 
     @Override
-    public void onBindViewHolder(RecyclerViewAdapter.NewsViewHolder personViewHolder, final int position) {
+    public void onBindViewHolder(@NonNull RecyclerViewAdapter.NewsViewHolder personViewHolder, @SuppressLint("RecyclerView") final int position) {
 
         personViewHolder.title.setText(post_list_serialzables.get(position).getTitle());
         personViewHolder.excerpt.setText(post_list_serialzables.get(position).getExcerpt());
diff --git a/app/src/main/java/org/SilverBlog/client/main_Activity.java b/app/src/main/java/org/SilverBlog/client/main_Activity.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -27,6 +27,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.zxing.activity.CaptureActivity;
+import com.reallct.qwe7002.smartblog_client.R;
 
 import java.util.ArrayList;
 import java.util.Map;
diff --git a/app/src/main/java/org/SilverBlog/client/post_Activity.java b/app/src/main/java/org/SilverBlog/client/post_Activity.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -19,6 +19,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.reallct.qwe7002.smartblog_client.R;
 
 public class post_Activity extends AppCompatActivity {
     EditText titleview;
diff --git a/app/src/main/java/org/SilverBlog/client/post_list_card_Activity.java b/app/src/main/java/org/SilverBlog/client/post_list_card_Activity.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -31,24 +31,21 @@
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.CenterCrop;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.reallct.qwe7002.smartblog_client.R;
 
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import static com.reallct.qwe7002.smartblog_client.RecyclerViewAdapter.sharedPreferences;
+import static org.SilverBlog.client.RecyclerViewAdapter.sharedPreferences;
 
 public class post_list_card_Activity extends AppCompatActivity {
     private static final String MY_BROADCAST_TAG = "com.reallct.qwe7002.smartblog_client";
diff --git a/app/src/main/java/org/SilverBlog/client/public_value.java b/app/src/main/java/org/SilverBlog/client/public_value.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 import com.google.gson.JsonArray;
 
diff --git a/app/src/main/java/org/SilverBlog/client/request.java b/app/src/main/java/org/SilverBlog/client/request.java
@@ -1,4 +1,4 @@
-package com.reallct.qwe7002.smartblog_client;
+package org.SilverBlog.client;
 
 
 import java.io.UnsupportedEncodingException;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.reallct.qwe7002.smartblog_client.main_Activity">
+    tools:context="org.SilverBlog.client.main_Activity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_receive.xml b/app/src/main/res/layout/activity_receive.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.reallct.qwe7002.smartblog_client.post_Activity">
+    tools:context="org.SilverBlog.client.post_Activity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/app_bar_post_list_card_.xml b/app/src/main/res/layout/app_bar_post_list_card_.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.reallct.qwe7002.smartblog_client.post_list_card_Activity">
+    tools:context="org.SilverBlog.client.post_list_card_Activity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_activity_main.xml b/app/src/main/res/layout/content_activity_main.xml
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.reallct.qwe7002.smartblog_client.main_Activity"
+    tools:context="org.SilverBlog.client.main_Activity"
     tools:showIn="@layout/activity_main">
 
     <View
@@ -49,7 +49,6 @@
             android:layout_marginTop="50dp"
             android:ems="10"
             android:hint="@string/admin_password"
-            android:imeActionId="@+id/login"
             android:imeOptions="actionUnspecified"
             android:inputType="textPassword"
             android:selectAllOnFocus="true" />
diff --git a/app/src/main/res/layout/content_post_list_card_.xml b/app/src/main/res/layout/content_post_list_card_.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.reallct.qwe7002.smartblog_client.post_list_card_Activity"
+    tools:context="org.SilverBlog.client.post_list_card_Activity"
     tools:showIn="@layout/app_bar_post_list_card_">
 
     <android.support.v4.widget.SwipeRefreshLayout
diff --git a/app/src/main/res/layout/content_receive.xml b/app/src/main/res/layout/content_receive.xml
@@ -10,7 +10,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.reallct.qwe7002.smartblog_client.post_Activity"
+    tools:context="org.SilverBlog.client.post_Activity"
     tools:showIn="@layout/activity_receive">
 
     <android.support.design.widget.TextInputLayout

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.reallct.qwe7002.smartblog_client;`
	`1`	`+package org.SilverBlog.client;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`	`4`	`import android.support.annotation.NonNull;`