k
/
FYReader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v2.1.7

Browse Source
master
fengyuecanzhu 3 years ago
parent 45d6012a62
commit 7499a6920a
8 changed files with 38 additions and 101 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      .idea/misc.xml
  2. 1
      app/release.md
  3. 1
      app/src/main/assets/updatelog.fy
  4. 1
      app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
  5. 9
      app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
  6. 119
      app/src/main/res/layout/activity_donate.xml
  7. 1
      app/src/main/res/values/strings.xml
  8. 2
      app/version_code.properties

3
.idea/misc.xml
Unescape View File

@ -4,9 +4,12 @@
<option name="filePathToZoomLevelMap"> <option name="filePathToZoomLevelMap">
<map> <map>
<entry key="..\:/android/FYReader/app/src/main/res/drawable/ic_re_seg.xml" value="0.1962962962962963" /> <entry key="..\:/android/FYReader/app/src/main/res/drawable/ic_re_seg.xml" value="0.1962962962962963" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/activity_about.xml" value="0.12132725430597771" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/activity_donate.xml" value="0.536" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/activity_more_setting.xml" value="0.264" /> <entry key="..\:/android/FYReader/app/src/main/res/layout/activity_more_setting.xml" value="0.264" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/fingerprint_dialog.xml" value="0.20425724637681159" /> <entry key="..\:/android/FYReader/app/src/main/res/layout/fingerprint_dialog.xml" value="0.20425724637681159" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/fragment_webdav_setting.xml" value="0.4" /> <entry key="..\:/android/FYReader/app/src/main/res/layout/fragment_webdav_setting.xml" value="0.4" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/layout_about_content.xml" value="0.12132725430597771" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/listview_search_book_item.xml" value="0.22010869565217392" /> <entry key="..\:/android/FYReader/app/src/main/res/layout/listview_search_book_item.xml" value="0.22010869565217392" />
<entry key="..\:/android/FYReader/app/src/main/res/layout/view_file_picker.xml" value="0.12132725430597771" /> <entry key="..\:/android/FYReader/app/src/main/res/layout/view_file_picker.xml" value="0.12132725430597771" />
<entry key="..\:/android/FYReader/app/src/main/res/menu/menu_book.xml" value="0.13703703703703704" /> <entry key="..\:/android/FYReader/app/src/main/res/menu/menu_book.xml" value="0.13703703703703704" />

1
app/release.md
Unescape View File

@ -3,3 +3,4 @@
* 3、备份/恢复路径支持自定义 * 3、备份/恢复路径支持自定义
* 4、优化搜索 * 4、优化搜索
* 5、修复已知bug * 5、修复已知bug
* 6、新增致谢名单

1
app/src/main/assets/updatelog.fy
Unescape View File

@ -6,6 +6,7 @@
3、备份/恢复路径支持自定义 3、备份/恢复路径支持自定义
4、优化搜索 4、优化搜索
5、修复已知bug 5、修复已知bug
6、新增致谢名单
2021.07.24 2021.07.24
风月读书v2.1.6 风月读书v2.1.6

1
app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
Unescape View File

@ -23,6 +23,7 @@ public class URLCONST {
public static final String AD_URL = FY_READER_URL + "/ad"; public static final String AD_URL = FY_READER_URL + "/ad";
public static final String LOG_UPLOAD_URL = FY_READER_URL + "/logUpload"; public static final String LOG_UPLOAD_URL = FY_READER_URL + "/logUpload";
public static final String THANKS_URL = FY_READER_URL + "/thanks/";
public static final String DONATE = "https://gitee.com/fengyuecanzhu/Donate/raw/master"; public static final String DONATE = "https://gitee.com/fengyuecanzhu/Donate/raw/master";

9
app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
Unescape View File

@ -13,6 +13,7 @@ import xyz.fycz.myreader.base.BaseActivity;
import xyz.fycz.myreader.base.observer.MySingleObserver; import xyz.fycz.myreader.base.observer.MySingleObserver;
import xyz.fycz.myreader.common.URLCONST; import xyz.fycz.myreader.common.URLCONST;
import xyz.fycz.myreader.databinding.ActivityDonateBinding; import xyz.fycz.myreader.databinding.ActivityDonateBinding;
import xyz.fycz.myreader.ui.dialog.MyAlertDialog;
import xyz.fycz.myreader.util.SharedPreUtils; import xyz.fycz.myreader.util.SharedPreUtils;
import xyz.fycz.myreader.util.ToastUtils; import xyz.fycz.myreader.util.ToastUtils;
import xyz.fycz.myreader.util.utils.AdUtils; import xyz.fycz.myreader.util.utils.AdUtils;
@ -52,17 +53,15 @@ public class DonateActivity extends BaseActivity {
});*/ });*/
} }
private void initAd() {
binding.llAdSupport.setVisibility(View.VISIBLE);
int flowAdCount = SharedPreUtils.getInstance().getInt("flowAdCount", 2);
int count = App.isDebug() ? flowAdCount : 1;
}
@Override @Override
protected void initClick() { protected void initClick() {
binding.llWxZsm.setOnClickListener(v -> goDonate(URLCONST.WX_ZSM)); binding.llWxZsm.setOnClickListener(v -> goDonate(URLCONST.WX_ZSM));
binding.llZfbSkm.setOnClickListener(v -> goDonate(URLCONST.ZFB_SKM)); binding.llZfbSkm.setOnClickListener(v -> goDonate(URLCONST.ZFB_SKM));
binding.llQqSkm.setOnClickListener(v -> goDonate(URLCONST.QQ_SKM)); binding.llQqSkm.setOnClickListener(v -> goDonate(URLCONST.QQ_SKM));
binding.rlThanks.setOnClickListener(v ->
MyAlertDialog.showFullWebViewDia(this, URLCONST.THANKS_URL,
false, null));
} }

119
app/src/main/res/layout/activity_donate.xml
Unescape View File

@ -104,103 +104,34 @@
android:textColor="@color/textAssist" /> android:textColor="@color/textAssist" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:id="@+id/ll_ad_support"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="10dp" />
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="vertical"
android:paddingLeft="5dp"
android:paddingRight="5dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="25dp"
android:gravity="center"
android:text="@string/ad_support"
android:textColor="@color/textPrimary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="15dp"
android:gravity="center"
android:text="@string/ad_support_tip"
android:textSize="@dimen/text_minimum_size"
android:textColor="@color/textSecondary" />
</LinearLayout>
<RelativeLayout
android:background="@color/colorForeground"
android:layout_width="match_parent"
android:layout_height="25dp"
android:paddingLeft="5dp"
android:paddingRight="5dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:text="@string/flow_ad_tip"
android:textColor="@color/textSecondary" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_inter_ad"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/selector_common_bg"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingTop="8dp"
android:paddingRight="20dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/inter_ad"
android:textColor="@color/textSecondary"
android:textSize="@dimen/text_normal_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:text="@string/donate_tip"
android:textColor="@color/textAssist" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_rewarded_video"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/selector_common_bg"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingTop="8dp"
android:paddingRight="20dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rewarded_video"
android:textColor="@color/textSecondary"
android:textSize="@dimen/text_normal_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:text="@string/donate_tip"
android:textColor="@color/textAssist" />
</LinearLayout>
</LinearLayout> <RelativeLayout
android:id="@+id/rl_thanks"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/selector_common_bg"
android:gravity="center"
android:paddingStart="20dp"
android:paddingEnd="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/thanks"
android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
app:srcCompat="@drawable/ic_right_arrow"
app:tint="@color/textSecondary" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

1
app/src/main/res/values/strings.xml
Unescape View File

@ -106,6 +106,7 @@
<string name="email">邮箱：fy@fycz.xyz</string> <string name="email">邮箱：fy@fycz.xyz</string>
<string name="this_github_url">https://github.com/fengyuecanzhu/FYReader</string> <string name="this_github_url">https://github.com/fengyuecanzhu/FYReader</string>
<string name="update">检查更新</string> <string name="update">检查更新</string>
<string name="thanks">致谢名单</string>
<!--file system--> <!--file system-->

2
app/version_code.properties
Unescape View File

@ -1,3 +1,3 @@
#Fri Jun 18 21:45:31 CST 2021 #Fri Jun 18 21:45:31 CST 2021
VERSION_CODE=217 VERSION_CODE=217
NEED_CREATE_RELEASE=true NEED_CREATE_RELEASE=false

Write Preview
Loading…
Cancel
Save