avatar larger

ekibun · Jun 14, 2020 · 45bc6cf · 45bc6cf
1 parent 732210b
commit 45bc6cf
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 55 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git 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
@@ -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
diff --git 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
@@ -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,20 +78,23 @@
             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"
             android:layout_height="wrap_content"
             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>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,4 +5,6 @@
 
     <dimen name="appBarSize">48dp</dimen>
     <dimen name="textSizeAppBarTitle">18sp</dimen>
+
+    <dimen name="avatarListSize">34dp</dimen>
 </resources>
diff --git 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>