Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 增加免责声明

This commit is contained in:
HuanChengFly 2020-04-15 23:11:35 +08:00
parent 6f60ed6571
commit e4b4998bc0
30 changed files with 28 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,2 +1,4 @@
## Tieba Lite
[![CircleCI](https://circleci.com/gh/HuanCheng65/TiebaLite.svg?style=svg)](https://circleci.com/gh/HuanCheng65/TiebaLite)
[![CircleCI](https://circleci.com/gh/HuanCheng65/TiebaLite.svg?style=svg)](https://circleci.com/gh/HuanCheng65/TiebaLite)
![Status](https://img.shields.io/badge/%E7%8A%B6%E6%80%81-%E5%B7%B2%E5%81%9C%E6%9B%B4-red?style=flat-square&labelColor=red&color=red)
这里是贴吧 Lite 的开源仓库。

2
SwipeBackLib/build.gradle
View File

@ -12,7 +12,7 @@ android {
}
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs

6
app/build.gradle
View File

@ -81,7 +81,7 @@ android {
release {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
debuggable false
jniDebuggable false
signingConfig signingConfigs.release
@ -119,7 +119,7 @@ dependencies {
implementation 'androidx.viewpager2:viewpager2:1.0.0'
//Test
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@ -130,7 +130,7 @@ dependencies {
implementation 'com.google.android.material:material:1.2.0-alpha05'
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
implementation 'com.squareup.okhttp3:okhttp:4.5.0'
implementation 'com.squareup.retrofit2:retrofit:2.8.1'
implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
implementation 'com.tsy:myokhttp:1.1.4'

17
app/src/main/java/com/huanchengfly/tieba/post/MainActivity.java
View File

@ -7,6 +7,7 @@ import android.app.job.JobScheduler;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
@ -275,6 +276,14 @@ public class MainActivity extends BaseActivity implements BottomNavigationView.O
findView();
initView();
initListener();
if (!SharedPreferencesUtil.get(SharedPreferencesUtil.SP_APP_DATA).getBoolean("notice_dialog", false)) {
showDialog(DialogUtil.build(this)
.setTitle(R.string.title_dialog_notice)
.setMessage(R.string.message_dialog_notice)
.setPositiveButton(R.string.button_sure_default, (dialog, which) -> SharedPreferencesUtil.put(this, SharedPreferencesUtil.SP_APP_DATA, "notice_dialog", true))
.setCancelable(false)
.create());
}
if (savedInstanceState == null) {
clearSwitchReason();
}
@ -394,14 +403,6 @@ public class MainActivity extends BaseActivity implements BottomNavigationView.O
.setTitle(R.string.title_dialog_changelog)
.setMessage(data.getResult())
.setPositiveButton(R.string.button_ok, null)
.setNegativeButton(R.string.title_join_group, (dialog, which) -> {
FlurryAgent.logEvent("clickedJoinQQGroupInChangelog");
startActivity(new Intent(MainActivity.this, AboutActivity.class).putExtra(AboutActivity.EXTRA_ACTION, AboutActivity.EXTRA_ACTION_JOIN_GROUP));
})
.setNeutralButton(R.string.button_support_me, (dialog, which) -> {
FlurryAgent.logEvent("clickedSupportBtnInChangelog");
startActivity(new Intent(MainActivity.this, AboutActivity.class).putExtra(AboutActivity.EXTRA_ACTION, AboutActivity.EXTRA_ACTION_DONATE));
})
.create());
}
}

59
app/src/main/java/com/huanchengfly/tieba/post/activities/AboutActivity.java
View File

@ -3,7 +3,6 @@ package com.huanchengfly.tieba.post.activities;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.RelativeLayout;
@ -11,50 +10,32 @@ import android.widget.TextView;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.flurry.android.FlurryAgent;
import com.huanchengfly.about.AboutPage;
import com.huanchengfly.theme.utils.ThemeUtils;
import com.huanchengfly.tieba.api.LiteApi;
import com.huanchengfly.tieba.api.interfaces.CommonAPICallback;
import com.huanchengfly.tieba.api.models.NewUpdateBean;
import com.huanchengfly.tieba.api.models.UpdateInfoBean;
import com.huanchengfly.tieba.post.R;
import com.huanchengfly.tieba.post.activities.base.BaseActivity;
import com.huanchengfly.tieba.post.base.BaseApplication;
import com.huanchengfly.tieba.post.models.PhotoViewBean;
import com.huanchengfly.tieba.post.utils.CacheUtil;
import com.huanchengfly.tieba.post.utils.DialogUtil;
import com.huanchengfly.tieba.post.utils.NavigationHelper;
import com.huanchengfly.tieba.post.utils.ThemeUtil;
import com.huanchengfly.tieba.post.utils.VersionUtil;
import java.util.ArrayList;
import java.util.List;
public class AboutActivity extends BaseActivity implements View.OnClickListener {
public static final int STATE_ERROR = 0;
public static final int STATE_NO_UPDATE = 1;
public static final int STATE_UPDATE = 2;
public static final String EXTRA_ACTION = "action";
public static final String EXTRA_ACTION_JOIN_GROUP = "join_group";
public static final String EXTRA_ACTION_DONATE = "donate";
public static final String CACHE_ID_QQ_GROUP = "qq_group";
private View updateTip;
private TextView updateTipHeaderTv;
private TextView updateTipTitleTv;
private TextView updateTipContentTv;
private Button dismissBtn;
private List<UpdateInfoBean.GroupInfo> groupInfoList;
private int updateState;
private Button downloadBtn;
private NewUpdateBean.ResultBean resultBean;
private AboutPage mAboutPage;
private NavigationHelper navigationHelper;
private String action;
private boolean actionExecuted = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -83,45 +64,13 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
mAboutPage = new AboutPage(this)
.setHeaderView(headerView)
.addTitle("应用信息", colorIcon)
.addItem(new AboutPage.Item("当前版本", VersionUtil.getVersionName(this), R.drawable.ic_round_info, colorIcon).setOnClickListener(v -> checkUpdate()))
.addItem(new AboutPage.Item("前往官网").setIcon(R.drawable.ic_codepen, colorIcon).setOnClickListener(v -> navigationHelper.navigationByData(NavigationHelper.ACTION_URL, "https://tblite.huanchengfly.tk/")))
.addItem(new AboutPage.Item(getString(R.string.title_join_group), "获取最新更新、提出建议或反馈").setIcon(R.drawable.ic_round_forum, colorIcon).setOnClickListener(v -> {
openJoinGroupDialog();
}))
.addTitle("开发参与", colorIcon)
.addItem(new AboutPage.Item("@幻了个城fly", "贴吧 Lite 开发者", "https://ww1.sinaimg.cn/large/007rAy9hgy1g1cohwq5rsj30hs0hsmxs.jpg").setIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("coolmarket://u/603089")).setPackage("com.coolapk.market").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)))
.addItem(new AboutPage.Item("@WeAreFun", "UI 设计指导", "https://ww1.sinaimg.cn/large/007rAy9hgy1g1cohx88l1j30dc0dcmyr.jpg").setIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("coolmarket://u/475044")).setPackage("com.coolapk.market").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)))
.addItem(new AboutPage.Item("@Fairyex", "图标设计", "https://ww1.sinaimg.cn/large/007rAy9hgy1g1cohx146ij30dc0dcabx.jpg").setIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("coolmarket://u/466253")).setPackage("com.coolapk.market").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)))
.addTitle("支持我", colorIcon)
.addItem(new AboutPage.Item("微信捐赠").setIcon(R.drawable.ic_wechat, colorIcon).setOnClickListener(v -> {
PhotoViewActivity.launch(this, new PhotoViewBean("https://huancheng65.github.io/TiebaLite/wechat_donate_qrcode.png", true));
FlurryAgent.logEvent("clickedWechatDonate");
}))
.addItem(new AboutPage.Item("支付宝捐赠")
.setIcon(R.drawable.ic_alipay, colorIcon)
.setOnClickListener(v -> {
navigationHelper.navigationByData(NavigationHelper.ACTION_URL, "https://qr.alipay.com/FKX06385UK8W8T8X2MG827");
FlurryAgent.logEvent("clickedAlipayDonate");
}))
.addItem(new AboutPage.Item("支付宝领红包")
.setIcon(R.drawable.ic_archive, colorIcon)
.setOnClickListener(v -> {
navigationHelper.navigationByData(NavigationHelper.ACTION_URL, "https://qr.alipay.com/c1x06336wvvmfwjwlzbq4a5");
FlurryAgent.logEvent("clickedAlipayRedpack");
}));
.addItem(new AboutPage.Item("当前版本", VersionUtil.getVersionName(this), R.drawable.ic_round_info, colorIcon))
.addItem(new AboutPage.Item("源代码").setIcon(R.drawable.ic_codepen, colorIcon).setOnClickListener(v -> navigationHelper.navigationByData(NavigationHelper.ACTION_URL, "https://github.com/HuanCheng65/TiebaLite")));
mAboutPage.into(mainView);
RecyclerView recyclerView = mAboutPage.getRecyclerView();
action = getIntent().getStringExtra(EXTRA_ACTION);
if (action != null) {
if (EXTRA_ACTION_DONATE.equals(action)) {
((LinearLayoutManager) recyclerView.getLayoutManager()).scrollToPositionWithOffset(9, 0);
actionExecuted = true;
}
}
checkUpdate();
loadGroups();
}
/*
private void openJoinGroupDialog() {
if (groupInfoList == null) {
return;
@ -143,7 +92,6 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
})
.show();
}
private void loadGroups() {
UpdateInfoBean cache = CacheUtil.getCache(this, CACHE_ID_QQ_GROUP, UpdateInfoBean.class);
if (cache != null) {
@ -192,6 +140,7 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
}
});
}
*/
private void checkUpdate() {
LiteApi.getInstance().newCheckUpdate(new CommonAPICallback<NewUpdateBean>() {

1
app/src/main/java/com/huanchengfly/tieba/post/fragments/WebViewFragment.java
View File

@ -57,6 +57,7 @@ import java.util.List;
import static com.huanchengfly.tieba.post.utils.FileUtil.FILE_TYPE_DOWNLOAD;
//TODO: 代码太烂，需要重写
public class WebViewFragment extends BaseFragment implements DownloadListener {
public static final String TAG = WebViewFragment.class.getSimpleName();
private static final String DEFAULT_TITLE = "贴吧 Lite";

6
app/src/main/java/com/huanchengfly/tieba/post/fragments/intro/ExploreFragment.java
View File

@ -64,12 +64,6 @@ public class ExploreFragment extends BaseIntroFragment implements View.OnClickLi
case R.id.explore_auto_sign:
startActivity(new Intent(getAttachContext(), SettingsActivity.class).putExtra("scroll_to_preference", "auto_sign"));
break;
case R.id.explore_qq:
startActivity(new Intent(getAttachContext(), AboutActivity.class).putExtra("action", "join_group"));
break;
case R.id.explore_donate:
startActivity(new Intent(getAttachContext(), AboutActivity.class).putExtra("action", "donate"));
break;
}
}
}

8
app/src/main/res/anim/in_right_to_left.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android" android:duration="150">
<translate
android:duration="150"
android:fromXDelta="100%p"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:toXDelta="0"/>
</set>

8
app/src/main/res/anim/out_left_to_right.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android" android:duration="150">
<translate
android:duration="150"
android:fromXDelta="0"
android:interpolator="@android:interpolator/accelerate_decelerate"
android:toXDelta="100%p"/>
</set>

4
app/src/main/res/drawable/ic_alipay.xml
View File

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="1024"
android:viewportWidth="1024" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M230.4,576.54C218.32,586.26 205.36,600.47 201.6,618.52 196.48,643.19 200.53,674.06 224.33,698.28 253.16,727.64 296.96,735.68 315.89,737.06 367.29,740.78 422.07,715.29 463.36,686.22 479.55,674.8 507.26,651.87 533.75,616.49 474.38,585.84 400.28,551.94 321.05,555.26 280.58,556.95 251.6,565.34 230.4,576.54ZM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.33,0 512,0 229.67,0 0,229.69 0,512 0,794.33 229.67,1024 512,1024 682.38,1024 833.49,940.28 926.63,811.88 838.63,768.13 693.6,696.14 604.27,652.58 561.64,701.17 498.62,749.88 427.43,771.07 382.71,784.36 342.39,789.44 300.23,780.82 258.49,772.27 227.75,752.73 209.83,733.14 200.7,723.14 190.22,710.43 182.63,695.32 183.34,697.23 183.83,698.37 183.83,698.37 183.83,698.37 179.47,690.84 176.13,678.87 174.41,673.08 173.26,667.05 172.79,660.72 172.43,656.58 172.34,652.22 172.59,647.68 172.21,639.98 172.52,631.9 174.26,623.62 178.44,603.38 187.08,579.81 209.43,557.92 258.49,509.89 324.21,507.3 358.24,507.5 408.67,507.79 496.28,529.85 570.06,555.94 590.49,512.42 603.6,465.88 612.06,434.84L305.31,434.84 305.31,401.68 462.83,401.68 462.83,335.34 272.14,335.34 272.14,302.17 462.83,302.17 462.83,235.85C462.83,226.75 464.63,219.27 479.41,219.27L554.03,219.27 554.03,302.17 761.32,302.17 761.32,335.34 554.03,335.34 554.03,401.68 719.85,401.68C719.85,401.68 703.2,494.5 651.13,586 766.69,627.27 929.26,690.84 983.26,712.08Z"/>
</vector>

4
app/src/main/res/drawable/ic_archive.xml
View File

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="512"
android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M460,120H52c-2.2,0 -4,-1.8 -4,-4V96c0,-17.7 14.3,-32 32,-32h352c17.7,0 32,14.3 32,32v20c0,2.2 -1.8,4 -4,4zM440,146H72c-4.4,0 -8,3.6 -8,8v262c0,17.6 14.4,32 32,32h320c17.6,0 32,-14.4 32,-32V154c0,-4.4 -3.6,-8 -8,-8zM306,288h-99.6c-7.1,0 -13.4,-5.2 -14.3,-12.3 -1,-8.5 5.6,-15.7 13.9,-15.7h99.6c7.1,0 13.4,5.2 14.3,12.3 1,8.4 -5.6,15.7 -13.9,15.7z"/>
</vector>

9
app/src/main/res/drawable/ic_block.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
</vector>

10
app/src/main/res/drawable/ic_outline_account_circle_white.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/white"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
</vector>

4
app/src/main/res/drawable/ic_qq.xml
View File

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="1024"
android:viewportWidth="1024" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M794.5,721.9c-9.7,56.1 -35.7,106.6 -73.3,146.4 40.8,18.9 77.6,47.7 77.6,90.3L225,958.6c0,-42.6 36.9,-71.3 77.6,-90.3 -37.6,-39.8 -63.7,-90.3 -73.3,-146.4 -43.1,63.2 -106.8,94.5 -106.8,94.5 0,-164 102.5,-386 102.5,-386v-81.2c0,-157.1 128.5,-284.4 286.9,-284.4 158.5,0 286.9,127.3 286.9,284.4v81.2s102.4,222 102.4,386c0.1,0 -63.7,-31.3 -106.7,-94.5zM794.5,721.9"/>
</vector>

9
app/src/main/res/drawable/ic_round_access_time.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM11.78,7h-0.06c-0.4,0 -0.72,0.32 -0.72,0.72v4.72c0,0.35 0.18,0.68 0.49,0.86l4.15,2.49c0.34,0.2 0.78,0.1 0.98,-0.24 0.21,-0.34 0.1,-0.79 -0.25,-0.99l-3.87,-2.3L12.5,7.72c0,-0.4 -0.32,-0.72 -0.72,-0.72z"/>
</vector>

11
app/src/main/res/drawable/ic_round_account_circle_white.xml
View File

@ -1,11 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/white"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:name="path"
android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
</vector>

9
app/src/main/res/drawable/ic_round_attach_money.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.42,0 2.13,0.54 2.39,1.4 0.12,0.4 0.45,0.7 0.87,0.7h0.3c0.66,0 1.13,-0.65 0.9,-1.27 -0.42,-1.18 -1.4,-2.16 -2.96,-2.54V4.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,3.67 10,4.5v0.66c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -1.65,0 -2.5,-0.59 -2.83,-1.43 -0.15,-0.39 -0.49,-0.67 -0.9,-0.67h-0.28c-0.67,0 -1.14,0.68 -0.89,1.3 0.57,1.39 1.9,2.21 3.4,2.53v0.67c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-0.65c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
</vector>

9
app/src/main/res/drawable/ic_round_local_mall.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M19,6h-2c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6L5,6c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,8c0,-1.1 -0.9,-2 -2,-2zM12,3c1.66,0 3,1.34 3,3L9,6c0,-1.66 1.34,-3 3,-3zM12,13c-2.33,0 -4.29,-1.59 -4.84,-3.75 -0.17,-0.63 0.32,-1.25 0.97,-1.25 0.47,0 0.85,0.34 0.98,0.8 0.35,1.27 1.51,2.2 2.89,2.2s2.54,-0.93 2.89,-2.2c0.13,-0.46 0.51,-0.8 0.98,-0.8 0.65,0 1.13,0.62 0.97,1.25C16.29,11.41 14.33,13 12,13z"/>
</vector>

9
app/src/main/res/drawable/ic_round_monetization_on.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13.41,18.09v0.58c0,0.73 -0.6,1.33 -1.33,1.33h-0.01c-0.73,0 -1.33,-0.6 -1.33,-1.33v-0.6c-1.33,-0.28 -2.51,-1.01 -3.01,-2.24 -0.23,-0.55 0.2,-1.16 0.8,-1.16h0.24c0.37,0 0.67,0.25 0.81,0.6 0.29,0.75 1.05,1.27 2.51,1.27 1.96,0 2.4,-0.98 2.4,-1.59 0,-0.83 -0.44,-1.61 -2.67,-2.14 -2.48,-0.6 -4.18,-1.62 -4.18,-3.67 0,-1.72 1.39,-2.84 3.11,-3.21v-0.6c0,-0.73 0.6,-1.33 1.33,-1.33h0.01c0.73,0 1.33,0.6 1.33,1.33v0.62c1.38,0.34 2.25,1.2 2.63,2.26 0.2,0.55 -0.22,1.13 -0.81,1.13h-0.26c-0.37,0 -0.67,-0.26 -0.77,-0.62 -0.23,-0.76 -0.86,-1.25 -2.12,-1.25 -1.5,0 -2.4,0.68 -2.4,1.64 0,0.84 0.65,1.39 2.67,1.91s4.18,1.39 4.18,3.91c-0.02,1.83 -1.39,2.83 -3.13,3.16z"/>
</vector>

9
app/src/main/res/drawable/ic_round_share.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92 -1.31,-2.92 -2.92,-2.92z"/>
</vector>

9
app/src/main/res/drawable/ic_round_touch_app.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM14.5,13.71c-0.28,-0.14 -0.58,-0.21 -0.89,-0.21L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.44,-0.72c-0.37,-0.08 -0.76,0.04 -1.03,0.31 -0.43,0.44 -0.43,1.14 0,1.58l4.01,4.01c0.38,0.37 0.89,0.58 1.42,0.58h6.1c1,0 1.84,-0.73 1.98,-1.72l0.63,-4.47c0.12,-0.85 -0.32,-1.69 -1.09,-2.07l-4.08,-2.03z"/>
</vector>

4
app/src/main/res/drawable/ic_wechat.xml
View File

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="1024"
android:viewportWidth="1024" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M681.8,357.56c11.04,0 21.9,0.84 32.82,2.04 -29.4,-136.92 -175.74,-238.62 -342.84,-238.62C185,120.98 32,248.24 32,409.94c0,93.3 50.88,169.92 135.96,229.44L134,741.56l118.8,-59.52c42.48,8.34 76.56,16.98 118.98,16.98 10.68,0 21.24,-0.48 31.68,-1.26 -6.6,-22.74 -10.5,-46.5 -10.5,-71.28C393.02,478.04 520.46,357.56 681.8,357.56zM499.16,265.46c25.68,0 42.54,16.86 42.54,42.42 0,25.44 -16.86,42.48 -42.54,42.48 -25.38,0 -50.94,-17.04 -50.94,-42.48C448.22,282.26 473.72,265.46 499.16,265.46zM261.38,350.36c-25.5,0 -51.18,-17.04 -51.18,-42.48 0,-25.56 25.68,-42.42 51.18,-42.42S303.8,282.26 303.8,307.88C303.8,333.32 286.88,350.36 261.38,350.36zM992,622.4c0,-135.84 -135.96,-246.54 -288.66,-246.54 -161.7,0 -288.96,110.76 -288.96,246.54 0,136.2 127.32,246.54 288.96,246.54 33.84,0 67.98,-8.46 101.94,-16.98l93.18,51.12 -25.56,-84.96C941.12,766.88 992,699.02 992,622.4zM609.62,579.86c-16.86,0 -33.96,-16.8 -33.96,-33.96 0,-16.92 17.1,-33.96 33.96,-33.96 25.8,0 42.54,17.04 42.54,33.96C652.16,563.06 635.42,579.86 609.62,579.86zM796.52,579.86c-16.74,0 -33.78,-16.8 -33.78,-33.96 0,-16.92 16.98,-33.96 33.78,-33.96 25.56,0 42.54,17.04 42.54,33.96C839.06,563.06 822.08,579.86 796.52,579.86z"/>
</vector>

5
app/src/main/res/drawable/tint_button.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:color="@color/default_color_primary" />
<item android:state_enabled="false" android:color="@color/default_color_divider" />
</selector>

10
app/src/main/res/layout/layout_footer_empty_loading.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.core.widget.ContentLoadingProgressBar
android:layout_centerInParent="true"
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout>

94
app/src/main/res/layout/layout_fragment_explore.xml
View File

@ -49,98 +49,4 @@
android:layout_height="wrap_content" />
</RelativeLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/explore_qq"
android:focusable="true"
android:clickable="true"
app:cardElevation="0dp"
app:contentPadding="16dp"
android:layout_marginTop="8dp"
app:cardBackgroundColor="@color/transparent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_alignParentStart="true"
android:id="@+id/explore_icon_qq"
android:layout_centerVertical="true"
android:src="@drawable/ic_qq"
android:tint="@color/default_color_accent"
android:layout_width="30dp"
android:layout_height="30dp" />
<TextView
android:layout_marginStart="16dp"
android:layout_marginBottom="4dp"
android:text="@string/title_join_group"
android:textColor="@color/default_color_text"
android:id="@+id/explore_title_qq"
android:layout_toEndOf="@+id/explore_icon_qq"
android:textStyle="bold"
android:textSize="15sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_alignStart="@id/explore_title_qq"
android:textSize="13sp"
android:text="@string/summary_join_group"
android:textColor="@color/default_color_text_secondary"
android:id="@+id/explore_subtitle_qq"
android:layout_below="@id/explore_title_qq"
android:layout_toEndOf="@+id/explore_icon_qq"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/explore_donate"
android:focusable="true"
android:clickable="true"
app:cardElevation="0dp"
app:contentPadding="16dp"
android:layout_marginTop="8dp"
app:cardBackgroundColor="@color/transparent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_alignParentStart="true"
android:id="@+id/explore_icon_donate"
android:layout_centerVertical="true"
android:src="@drawable/ic_round_monetization_on"
android:tint="@color/default_color_accent"
android:layout_width="30dp"
android:layout_height="30dp" />
<TextView
android:layout_marginStart="16dp"
android:layout_marginBottom="4dp"
android:text="@string/title_donate"
android:textColor="@color/default_color_text"
android:id="@+id/explore_title_donate"
android:layout_toEndOf="@+id/explore_icon_donate"
android:textStyle="bold"
android:textSize="15sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_alignStart="@id/explore_title_donate"
android:textSize="13sp"
android:text="@string/summary_donate"
android:textColor="@color/default_color_text_secondary"
android:id="@+id/explore_subtitle_donate"
android:layout_below="@id/explore_title_donate"
android:layout_toEndOf="@+id/explore_icon_donate"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>

4
app/src/main/res/values-night/booleans.xml
View File

@ -1,4 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="splash_light">false</bool>
</resources>
<resources></resources>

4
app/src/main/res/values/booleans.xml
View File

@ -1,4 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="splash_light">true</bool>
</resources>
<resources></resources>

34
app/src/main/res/values/strings.xml
View File

@ -33,7 +33,6 @@
<string name="title_pure_read">沉浸阅读</string>
<string name="content_avatar">头像</string>
<string name="tip_login">请先登录</string>
<string name="tip_has_update">更新</string>
<string name="tip_loading">正在加载…</string>
<string name="title_sort">倒序浏览</string>
<string name="title_see_lz">只看楼主</string>
@ -84,9 +83,7 @@
<string name="text_message_list_item_reply_my_thread">回复我的主题：%1$s</string>
<string name="title_reply_me">回复我的</string>
<string name="title_to_thread">查看主题</string>
<string name="title_search_toolbar">搜索 %1$s 的结果</string>
<string name="tip_position">%1$s / %2$s</string>
<string name="tip_restart">重启程序后生效</string>
<string name="title_floor_loaded">%1$s 楼的回复</string>
<string name="title_send_to_desktop">发送到桌面</string>
<string name="toast_send_to_desktop_success">已尝试发送快捷方式</string>
@ -111,7 +108,6 @@
<string name="tip_check_beta_update">Beta 版本可能不稳定</string>
<string name="tip_about">当前版本 %1$s</string>
<string name="title_update_stoken">正在更新登录信息</string>
<string name="title_update_webview_info">正在更新数据</string>
<string name="tip_account_error">提示：若您的账号登录失效，可点击“添加账号”，然后登录相同的账号即可更新登录信息。</string>
<string name="tips_message_reply">你有 %1$s 条新回复</string>
<string name="tips_message_at">有 %1$s 人提到了你</string>
@ -122,7 +118,6 @@
<string name="tip_no_intro">这个人很懒，什么都没有写</string>
<string name="url_user_home"><![CDATA[https://tieba.baidu.com/home/main?un=%1$s&tab=%2$d]]></string>
<string name="title_block">屏蔽此用户</string>
<string name="title_block_dialog">选择操作</string>
<string name="toast_add_success">添加成功</string>
<string name="toast_unlike_success">取消关注成功</string>
<string name="toast_unlike_failed">取消关注失败 %1$s</string>
@ -155,19 +150,14 @@
<string name="title_dialog_exit_account">确认退出登录吗？</string>
<string name="tip_new_version">发现新版本 %1$s</string>
<string name="title_dialog_update_stoken">您的登录信息需要更新</string>
<string name="title_dialog_update_webview_info">我们需要更新一些数据</string>
<string name="message_dialog_update_stoken">这不会花费您太多时间，请点击“确定”开始更新</string>
<string name="title_dialog_logged_in_expired">您的登录信息似乎已过期</string>
<string name="message_dialog_logged_in_expired">请您重新登录</string>
<string name="title_dialog_crash">贴吧 Lite 发生了一个错误</string>
<string name="button_copy">复制</string>
<string name="message_dialog_crash">我们已为您重启了程序，您可以复制下面的崩溃详情反馈给开发者\n%1$s</string>
<string name="button_next_time">下次再说</string>
<string name="button_go_to_download">去下载</string>
<string name="title_dialog_update">发现新版本 %1$s</string>
<string name="tip_beta_version">Beta 版本可能不稳定，请谨慎更新\n</string>
<string name="title_dialog_permission">我们需要获取您的部分权限</string>
<string name="message_permission">这些权限将仅用于必要的工作。\n「存储空间」权限：用于保存、上传图片\n「电话」权限：获取您的 IMEI 以用于请求百度 API</string>
<string name="toast_no_permission_insert_photo">未授予「存储空间」权限，无法插入图片</string>
<string name="message_need_permission">这些权限将仅用于必要的工作。\n</string>
<string name="message_permission_desc">「%1$s」权限：%2$s\n</string>
@ -191,7 +181,6 @@
<string name="title_report">举报</string>
<string name="title_level_old_style">使用旧样式的等级图标</string>
<string name="url_post_report"><![CDATA[https://tieba.baidu.com/mo/q/postreport?fid=%1$s&tid=%2$s&pid=%3$s]]></string>
<string name="url_thread_report"><![CDATA[https://tieba.baidu.com/mo/q/postreport?fid=%1$s&tid=%2$s]]></string>
<string name="title_dialog_del_post">确定要删除吗？</string>
<string name="toast_delete_error">删除失败 %1$s</string>
<string name="toast_delete_thread_success">删除成功</string>
@ -199,8 +188,6 @@
<string name="tip_user_hide">该用户已隐藏个人动态</string>
<string name="tip_stat">%1$s 关注\u3000%2$s 粉丝</string>
<string name="tip_from_forum">%1$s吧</string>
<string name="title_download_direct">直链下载</string>
<string name="title_download_web_disk_with_pw">%1$s 密码%2$s</string>
<string name="title_dialog_download">选择下载方式</string>
<string name="tip_from_history">您上次阅读到第 %1$s 楼</string>
<string name="update_tip_no_title">贴吧 Lite 当前已是最新版本</string>
@ -230,7 +217,6 @@
<string name="settings_forum_single">吧列表单列显示</string>
<string name="title_hide_explore">隐藏首页「动态」入口</string>
<string name="settings_show_shortcut">在贴内显示快捷进吧入口</string>
<string name="title_join_group">加入交流群</string>
<string name="title_clear_search_history">清除搜索记录</string>
<string name="toast_clear_success">清除成功</string>
<string name="toast_network_error">网络似乎有问题</string>
@ -253,10 +239,7 @@
<string name="button_follow">关注</string>
<string name="button_unfollow">取消关注</string>
<string name="error_unknown">未知错误</string>
<string name="error_baidu_api">百度又又又抽风了…</string>
<string name="error_parse_api">API 解析失败</string>
<string name="title_top_forum">置顶的贴吧</string>
<string name="error_not_logged_in">账号未登录</string>
<string name="title_use_webview">使用内置浏览器</string>
<string name="tip_use_webview_on">所有链接都将使用内置浏览器打开</string>
<string name="tip_use_webview">仅贴吧链接将使用内置浏览器打开</string>
@ -273,9 +256,6 @@
<string name="tip_refresh">上次阅读到此处，点击刷新</string>
<string name="tip_show_shortcut_in_thread">开启后，将在贴子内显示快速进吧的入口</string>
<string name="tip_show_shortcut_in_thread_on">将在贴子内显示快速进吧的入口</string>
<string name="key_show_time">show_time</string>
<string name="settings_show_time">贴列表显示时间</string>
<string name="title_settings_show_time">设置浏览吧时贴列表显示的时间</string>
<string name="button_finish">完成</string>
<string name="tip_primary_color">主题色</string>
<string name="title_custom_theme">设置自定义主题</string>
@ -291,10 +271,6 @@
<string name="title_hot_message_list">热议话题</string>
<string name="desc_hot_message_list">(每小时更新一次,以实时讨论量排序)</string>
<string name="toast_photo_saved">图片保存在 %1$s</string>
<string name="slogan_app_intro">贴吧 Lite 是一个极简的贴吧第三方客户端</string>
<string name="title_ask_for_permission">权限申请</string>
<string name="title_enjoy">敬请享受吧！</string>
<string name="tip_report_bug">发现 Bug 请至评论区反馈</string>
<string name="title_settings_default_sort_type">吧默认排序方式</string>
<string name="summary_default_sort_type">设置浏览吧是贴子的默认排序方式</string>
<string name="toast_load_failed">加载失败</string>
@ -338,9 +314,6 @@
<string name="title_select_theme">选择主题</string>
<string name="tip_ask_permission">轻按“继续”以开始授权</string>
<string name="summary_join_group">获取最新更新、提出建议或反馈</string>
<string name="title_donate">支持我</string>
<string name="summary_donate">请我喝饮料，或者领个大红包</string>
<string name="title_intro_completed">一切就绪！</string>
<string name="subtitle_intro_completed">接下来，登录您的百度账号，然后开始使用吧</string>
<string name="title_share_pic">分享图片</string>
@ -348,12 +321,9 @@
<string name="tip_permission_storage_download">用于下载文件</string>
<string name="toast_max_selectable">最多选择 10 张图片</string>
<string name="title_dialog_changelog">版本更新日志</string>
<string name="button_support_me">支持一下</string>
<string name="username_both">%1$s(%2$s)</string>
<string name="title_show_both_username_and_nickname">同时显示用户名和昵称</string>
<string name="title_preference_radius">图片圆角大小</string>
<string name="placeholder_text_username">emmmmmmmmmm</string>
<string name="placeholder_text_content">emmmm</string>
<string name="tab_forum_info">信息</string>
<string name="forum_hot">%1$s 人关注 %2$s 篇贴子</string>
<string name="title_friend_forums">友情贴吧</string>
@ -362,7 +332,6 @@
<string name="search_clear_all">清除全部历史</string>
<string name="fans_num">粉丝: %s</string>
<string name="title_dialog_clip_board_tieba_url">是否要打开剪贴板中的链接</string>
<string name="message_dialog_clip_board_tieba_url">发现链接「%s」</string>
<string name="subtitle_quick_preview_thread">来自%1$s吧，共 %2$s 条回复</string>
<string name="subtitle_link">网页链接</string>
<string name="title_comic_mode">开启漫画模式</string>
@ -370,7 +339,6 @@
<string name="toast_comic_mode_on">漫画模式已开启</string>
<string name="toast_comic_mode_off">漫画模式已关闭</string>
<string name="toast_preparing_share_pic">下载图片中…</string>
<string name="title_telegram_group">加入 Telegram 群</string>
<string name="title_select_pic">选择背景图片</string>
<string name="title_dialog_translucent_theme">透明主题(BETA)设置</string>
<string name="title_translucent_theme_alpha">透明度</string>
@ -384,4 +352,6 @@
<string name="toast_like_failed">关注失败 %s</string>
<string name="toast_please_login">请先登录</string>
<string name="toast_nav_failed">跳转失败</string>
<string name="title_dialog_notice">免责声明</string>
<string name="message_dialog_notice">本软件仅供交流学习使用，严禁用于商业用途，请于下载后 24 小时内删除。</string>
</resources>

4
application.properties
View File

@ -1,4 +1,4 @@
versionCode=38006
versionCode=38100
versionName=3.8.1
isPerVersion=true
isPerVersion=false
perVersion=beta2

2
build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.61'
ext.kotlin_version = '1.3.71'
repositories {
maven { url 'https://maven.aliyun.com/repository/google' }
maven { url 'https://maven.aliyun.com/repository/jcenter' }