From 3a1fe8da1d2e24f0492dabcc7fb142d3fc207bfc Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 23 Aug 2014 11:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=AF=E8=83=BD=E7=9A=84?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidManifest.xml | 4 +- res/layout/download_list_item.xml | 2 +- res/layout/favorite_list_item.xml | 51 ++++++++------- res/layout/gallery_list_detail_item.xml | 62 ++++++++----------- res/raw/change_log | 4 ++ res/values/styles.xml | 1 - .../hippo/ehviewer/ui/FavouriteActivity.java | 15 +++-- 7 files changed, 73 insertions(+), 66 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0d622f8eb..13a2e0518 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,8 @@ --> + android:versionCode="22" + android:versionName="0.6.1" > - + diff --git a/res/layout/favorite_list_item.xml b/res/layout/favorite_list_item.xml index 65e3ae42f..fe9049b5c 100644 --- a/res/layout/favorite_list_item.xml +++ b/res/layout/favorite_list_item.xml @@ -28,12 +28,12 @@ android:layout_marginTop="4dp" > + android:layout_toRightOf="@id/thumb" /> - - - - + android:layout_alignBottom="@id/thumb" + android:layout_alignLeft="@id/title" + android:layout_marginBottom="8dp" + android:paddingBottom="2dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="2dp" + android:textColor="@android:color/white" /> + + + \ No newline at end of file diff --git a/res/layout/gallery_list_detail_item.xml b/res/layout/gallery_list_detail_item.xml index 783331780..ada512b1c 100644 --- a/res/layout/gallery_list_detail_item.xml +++ b/res/layout/gallery_list_detail_item.xml @@ -55,44 +55,36 @@ - + android:layout_alignBottom="@id/thumb" + android:layout_marginBottom="8dp" + android:paddingBottom="2dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="2dp" + android:textColor="@android:color/white" /> - + - - - - - + \ No newline at end of file diff --git a/res/raw/change_log b/res/raw/change_log index 97802b241..042b37287 100644 --- a/res/raw/change_log +++ b/res/raw/change_log @@ -1,3 +1,7 @@ +Version 0.6.1 (2014-08-22) +* 修正早期系统版本布局错误 +* 修正可能出现的通知闪烁 + Version 0.6.0 (2014-08-22) * 调整界面 * 用户信息中显示用户名改为显示昵称 diff --git a/res/values/styles.xml b/res/values/styles.xml index 04274fd2d..26ba585a4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -199,7 +199,6 @@ diff --git a/src/com/hippo/ehviewer/ui/FavouriteActivity.java b/src/com/hippo/ehviewer/ui/FavouriteActivity.java index 2f0c02db3..0a7b42d81 100644 --- a/src/com/hippo/ehviewer/ui/FavouriteActivity.java +++ b/src/com/hippo/ehviewer/ui/FavouriteActivity.java @@ -640,7 +640,7 @@ public class FavouriteActivity extends AbsGalleryActivity new int[]{}}, new int[]{0xff84cae4, 0xff33b5e5, 0xFFFAFAFA}, null, false); } - final LoadImageView thumb = (LoadImageView)convertView.findViewById(R.id.cover); + final LoadImageView thumb = (LoadImageView)convertView.findViewById(R.id.thumb); if (!String.valueOf(gi.gid).equals(thumb.getKey())) { // Set margin top 8dp if position is 0, otherwise 4dp LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) @@ -657,7 +657,7 @@ public class FavouriteActivity extends AbsGalleryActivity new LoadImageView.SimpleImageGetListener(thumb).setFixScaleType(true)); } // Set manga name - TextView name = (TextView) convertView.findViewById(R.id.name); + TextView name = (TextView) convertView.findViewById(R.id.title); name.setText(gi.title); // Set uploder TextView uploader = (TextView) convertView.findViewById(R.id.uploader); @@ -674,9 +674,16 @@ public class FavouriteActivity extends AbsGalleryActivity .findViewById(R.id.rate); rate.setRating(gi.rating); // set posted - TextView posted = (TextView) convertView.findViewById(R.id.posted); + TextView posted = (TextView)convertView.findViewById(R.id.posted); posted.setText(gi.posted); - + // Set simple language + TextView simpleLanguage = (TextView)convertView.findViewById(R.id.simple_language); + if (gi.simpleLanguage == null) { + simpleLanguage.setVisibility(View.GONE); + } else { + simpleLanguage.setVisibility(View.VISIBLE); + simpleLanguage.setText(gi.simpleLanguage); + } return convertView; } }