old
zlj 5 years ago
parent 8f98545db3
commit 9cb0ef73f2
  1. 3
      .idea/codeStyles/Project.xml
  2. 2
      app/src/main/AndroidManifest.xml
  3. 8
      app/src/main/java/com/novel/read/activity/NovelReadActivity.kt
  4. 2
      app/src/main/java/com/novel/read/adapter/HumanAdapter.java

@ -1,5 +1,8 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<AndroidXmlCodeStyleSettings>
<option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
</AndroidXmlCodeStyleSettings>
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings> </JetCodeStyleSettings>

@ -18,7 +18,7 @@
android:icon="@mipmap/logo" android:icon="@mipmap/logo"
android:logo="@mipmap/logo" android:logo="@mipmap/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/logo"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppDartTheme" android:theme="@style/AppDartTheme"
android:networkSecurityConfig="@xml/network_security_config" android:networkSecurityConfig="@xml/network_security_config"

@ -279,7 +279,7 @@ class NovelReadActivity : NovelBaseActivity(), DownloadService.OnDownloadListene
read_tv_brief.setOnClickListener { read_tv_brief.setOnClickListener {
val intent = Intent(this, NovelBookDetailActivity::class.java) val intent = Intent(this, NovelBookDetailActivity::class.java)
intent.putExtra(Constant.Bundle.BookId, Integer.valueOf(mBookId!!)) intent.putExtra(Constant.Bundle.BookId, Integer.valueOf(mBookId))
startActivity(intent) startActivity(intent)
} }
@ -391,12 +391,12 @@ class NovelReadActivity : NovelBaseActivity(), DownloadService.OnDownloadListene
tvBookReadMode.text = resources.getString(R.string.book_read_mode_day) tvBookReadMode.text = resources.getString(R.string.book_read_mode_day)
val drawable = ContextCompat.getDrawable(this, R.drawable.ic_read_menu_moring) val drawable = ContextCompat.getDrawable(this, R.drawable.ic_read_menu_moring)
tvBookReadMode.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null) tvBookReadMode.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null)
cl_layout.setBackgroundColor(resources.getColor(R.color.nb_read_bg_night)) cl_layout.setBackgroundColor(ContextCompat.getColor(this,R.color.nb_read_bg_night))
} else { } else {
tvBookReadMode.text = resources.getString(R.string.book_read_mode_day) tvBookReadMode.text = resources.getString(R.string.book_read_mode_day)
val drawable = ContextCompat.getDrawable(this, R.drawable.ic_read_menu_night) val drawable = ContextCompat.getDrawable(this, R.drawable.ic_read_menu_night)
tvBookReadMode.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null) tvBookReadMode.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null)
cl_layout.setBackgroundColor(resources.getColor(ReadSettingManager.getInstance().pageStyle.bgColor)) cl_layout.setBackgroundColor(ContextCompat.getColor(this,ReadSettingManager.getInstance().pageStyle.bgColor))
} }
} }
@ -566,7 +566,7 @@ class NovelReadActivity : NovelBaseActivity(), DownloadService.OnDownloadListene
} }
Log.e(TAG, "onBackPressed: " + mCollBook!!.bookChapters.isEmpty()) Log.e(TAG, "onBackPressed: " + mCollBook!!.bookChapters.isEmpty())
if (!mCollBook!!.isLocal && !isCollected && !mCollBook!!.bookChapters.isEmpty()) { if (!mCollBook!!.isLocal && !isCollected && mCollBook!!.bookChapters.isNotEmpty()) {
val alertDialog = AlertDialog.Builder(this) val alertDialog = AlertDialog.Builder(this)
.setTitle(getString(R.string.add_book)) .setTitle(getString(R.string.add_book))
.setMessage(getString(R.string.like_book)) .setMessage(getString(R.string.like_book))

@ -21,7 +21,7 @@ import com.novel.read.utlis.GlideImageLoader;
import java.util.List; import java.util.List;
/** /**
* create by 赵利君 on 2019/6/19 * create by zlj on 2019/6/19
* describe: * describe:
*/ */
public class HumanAdapter extends RecyclerView.Adapter<HumanAdapter.ViewHolder> { public class HumanAdapter extends RecyclerView.Adapter<HumanAdapter.ViewHolder> {

Loading…
Cancel
Save