From 45bc6cf0e88fe61f9b611293376b294775e5ce33 Mon Sep 17 00:00:00 2001
From: ekibun <soekibun@gmail.com>
Date: Sun, 14 Jun 2020 16:15:15 +0800
Subject: [PATCH] avatar larger

---
 .idea/caches/build_file_checksums.ser         | Bin 538 -> 538 bytes
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   2 +-
 app/src/main/AndroidManifest.xml              |   6 -----
 app/src/main/java/soko/ekibun/bangumi/App.kt  |   3 ---
 .../java/soko/ekibun/bangumi/RemoteService.kt |  20 ----------------
 .../main/res/layout/item_avatar_header.xml    |   8 +++----
 app/src/main/res/layout/item_blog.xml         |  22 ++++++++++--------
 app/src/main/res/layout/item_comment.xml      |   4 ++--
 app/src/main/res/layout/item_reply.xml        |   4 ++--
 app/src/main/res/layout/item_say.xml          |   4 ++--
 app/src/main/res/layout/item_timeline.xml     |   4 ++--
 app/src/main/res/layout/item_topic.xml        |   4 ++--
 app/src/main/res/values/dimens.xml            |   2 ++
 app/src/main/res/values/strings.xml           |   2 +-
 15 files changed, 31 insertions(+), 55 deletions(-)
 delete mode 100644 app/src/main/java/soko/ekibun/bangumi/RemoteService.kt

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1e4fda1d66c53706b47900b30453a50daf80ede8..d991c5d3b32c680ef079a0c7b03d56ffbc2b8e8d 100644
GIT binary patch
delta 15
XcmbQmGK*!x43;&Q{O@g?Q^yDZG<F8y

delta 15
WcmbQmGK*!x43^xOtn`g@>KFknlLgNJ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 33b144a..0f8fc3a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,5 +14,6 @@
         </option>
       </GradleProjectSettings>
     </option>
+    <option name="offlineMode" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0d2f69e..6199cc2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9de09b6..5050d6b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,12 +21,6 @@
             tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
         <activity android:name=".ui.say.SayActivity">
         </activity>
-
-        <service
-                android:name=".RemoteService"
-                android:exported="false">
-        </service>
-
         <activity
                 android:name=".ui.setting.SettingsActivity"
                 android:label="@string/settings"
diff --git a/app/src/main/java/soko/ekibun/bangumi/App.kt b/app/src/main/java/soko/ekibun/bangumi/App.kt
index 770b2f9..659e688 100644
--- a/app/src/main/java/soko/ekibun/bangumi/App.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/App.kt
@@ -2,7 +2,6 @@ package soko.ekibun.bangumi
 
 import android.app.Application
 import android.content.Context
-import android.content.Intent
 import androidx.preference.PreferenceManager
 import com.umeng.commonsdk.UMConfigure
 import soko.ekibun.bangumi.model.DataCacheModel
@@ -15,13 +14,11 @@ import soko.ekibun.bangumi.util.HttpUtil
  * App entry
  * @property dataCacheModel DataCacheModel
  * @property pluginInstance Map<Context, Any>?
- * @property remoteAction Function3<[@kotlin.ParameterName] Intent?, [@kotlin.ParameterName] Int, [@kotlin.ParameterName] Int, Unit>
  */
 class App : Application() {
     val sp by lazy { PreferenceManager.getDefaultSharedPreferences(this) }
     val dataCacheModel by lazy { DataCacheModel(this) }
     lateinit var pluginInstance: Map<Context, Any>
-    var remoteAction: (intent: Intent?, flags: Int, startId: Int) -> Unit = { _, _, _ -> }
 
     override fun onCreate() {
         super.onCreate()
diff --git a/app/src/main/java/soko/ekibun/bangumi/RemoteService.kt b/app/src/main/java/soko/ekibun/bangumi/RemoteService.kt
deleted file mode 100644
index c6a5d4e..0000000
--- a/app/src/main/java/soko/ekibun/bangumi/RemoteService.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package soko.ekibun.bangumi
-
-import android.app.Service
-import android.content.Intent
-import android.os.IBinder
-
-/**
- * 远程服务（plugin）
- */
-class RemoteService : Service() {
-
-    override fun onBind(intent: Intent): IBinder? {
-        return null
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        (application as App).remoteAction(intent, flags, startId)
-        return super.onStartCommand(intent, flags, startId)
-    }
-}
diff --git a/app/src/main/res/layout/item_avatar_header.xml b/app/src/main/res/layout/item_avatar_header.xml
index f47682e..f352c30 100644
--- a/app/src/main/res/layout/item_avatar_header.xml
+++ b/app/src/main/res/layout/item_avatar_header.xml
@@ -14,8 +14,8 @@
     <com.github.siyamed.shapeimageview.CircularImageView
             app:siBorderAlpha="0"
             android:id="@+id/item_avatar_left"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/avatarListSize"
+            android:layout_height="@dimen/avatarListSize"
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription"
             tools:src="@drawable/err_404"
@@ -27,8 +27,8 @@
     <com.github.siyamed.shapeimageview.CircularImageView
             app:siBorderAlpha="0"
             android:id="@+id/item_avatar_right"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/avatarListSize"
+            android:layout_height="@dimen/avatarListSize"
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription"
             tools:src="@drawable/err_404"
diff --git a/app/src/main/res/layout/item_blog.xml b/app/src/main/res/layout/item_blog.xml
index 1d8ee4b..c40606c 100644
--- a/app/src/main/res/layout/item_blog.xml
+++ b/app/src/main/res/layout/item_blog.xml
@@ -19,13 +19,12 @@
     <com.github.siyamed.shapeimageview.CircularImageView
             app:siBorderAlpha="0"
             android:id="@+id/item_avatar"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/avatarListSize"
+            android:layout_height="@dimen/avatarListSize"
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription"
             app:layout_constraintTop_toTopOf="@+id/item_user"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toBottomOf="@+id/item_time"
             tools:src="@drawable/err_404"/>
     <TextView
             android:id="@+id/item_user"
@@ -39,16 +38,16 @@
             app:layout_constraintTop_toTopOf="parent"
             android:layout_marginLeft="8dp"
             tools:text="UserName"/>
+
     <TextView
             android:id="@+id/item_time"
-            android:layout_width="0dp"
-            android:layout_marginTop="2dp"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="3dp"
             android:layout_height="wrap_content"
             android:textSize="@dimen/textSizeSmall"
             android:ellipsize="end"
             android:singleLine="true"
             app:layout_constraintLeft_toLeftOf="@+id/item_user"
-            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/item_user"
             tools:text="2019-04-23"/>
     <TextView
@@ -79,8 +78,8 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/item_title"
             tools:text="Blog Content..."/>
+
     <TextView
-            android:layout_marginTop="6dp"
             android:alpha="0.5"
             android:id="@+id/item_comment"
             android:layout_width="0dp"
@@ -88,11 +87,14 @@
             android:textSize="@dimen/textSizeSmall"
             android:singleLine="true"
             android:ellipsize="end"
+            android:layout_marginLeft="6dp"
             app:layout_constraintLeft_toRightOf="@+id/item_avatar"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_summary"
-            app:layout_constraintStart_toStartOf="@+id/item_summary"
             app:layout_constraintEnd_toEndOf="parent"
-            tools:text="0 回复"/>
+            tools:text="+0 回复"
+            app:layout_constraintStart_toEndOf="@+id/item_time"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintTop_toTopOf="@+id/item_time"
+            app:layout_constraintBottom_toBottomOf="@+id/item_time"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 2d9f209..dc70ac0 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -23,8 +23,8 @@
         <com.github.siyamed.shapeimageview.CircularImageView
                 app:siBorderAlpha="0"
                 android:id="@+id/item_avatar"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
+                android:layout_width="@dimen/avatarListSize"
+                android:layout_height="@dimen/avatarListSize"
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription"
                 tools:src="@drawable/err_404"
diff --git a/app/src/main/res/layout/item_reply.xml b/app/src/main/res/layout/item_reply.xml
index 0d6089d..482d2ec 100644
--- a/app/src/main/res/layout/item_reply.xml
+++ b/app/src/main/res/layout/item_reply.xml
@@ -32,8 +32,8 @@
     <com.github.siyamed.shapeimageview.CircularImageView
             app:siBorderAlpha="0"
             android:id="@+id/item_avatar"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/avatarListSize"
+            android:layout_height="@dimen/avatarListSize"
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription"
             tools:src="@drawable/err_404"
diff --git a/app/src/main/res/layout/item_say.xml b/app/src/main/res/layout/item_say.xml
index 0f3ec9e..5c31488 100644
--- a/app/src/main/res/layout/item_say.xml
+++ b/app/src/main/res/layout/item_say.xml
@@ -12,8 +12,8 @@
     <com.github.siyamed.shapeimageview.CircularImageView
             app:siBorderAlpha="0"
             android:id="@+id/item_avatar"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/avatarListSize"
+            android:layout_height="@dimen/avatarListSize"
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription"
             tools:src="@drawable/err_404"
diff --git a/app/src/main/res/layout/item_timeline.xml b/app/src/main/res/layout/item_timeline.xml
index ba0aa5b..6dcf04d 100644
--- a/app/src/main/res/layout/item_timeline.xml
+++ b/app/src/main/res/layout/item_timeline.xml
@@ -17,8 +17,8 @@
     <com.github.siyamed.shapeimageview.CircularImageView
             app:siBorderAlpha="0"
             android:id="@+id/item_avatar"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/avatarListSize"
+            android:layout_height="@dimen/avatarListSize"
             android:scaleType="centerCrop"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_topic.xml b/app/src/main/res/layout/item_topic.xml
index 57f8102..ec0c977 100644
--- a/app/src/main/res/layout/item_topic.xml
+++ b/app/src/main/res/layout/item_topic.xml
@@ -19,8 +19,8 @@
     <com.github.siyamed.shapeimageview.CircularImageView
             app:siBorderAlpha="0"
             android:id="@+id/item_avatar"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/avatarListSize"
+            android:layout_height="@dimen/avatarListSize"
             android:scaleType="centerCrop"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4d279db..80ac76e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,4 +5,6 @@
 
     <dimen name="appBarSize">48dp</dimen>
     <dimen name="textSizeAppBarTitle">18sp</dimen>
+
+    <dimen name="avatarListSize">34dp</dimen>
 </resources>
\ 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 889a1a8..db58023 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -271,7 +271,7 @@
     <string name="phrase_duration">时长：%1$s</string>
     <string name="phrase_comment">讨论（+%1$d）</string>
 
-    <string name="phrase_reply">%1$d 回复</string>
+    <string name="phrase_reply">+%1$d 回复</string>
 
     <!-- 超展开 -->
     <string name="parse_hint_reply_topic">回复 %1$s</string>