mirror of https://github.com/kurisufriend/Clover
Conflicts: Clover/app/src/main/java/org/floens/chan/Chan.java Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.javamultisite
KOSBUM
10 years ago
commit
9654c0ab38
@ -0,0 +1,36 @@ |
||||
/* |
||||
* Clover - 4chan browser https://github.com/Floens/Clover/
|
||||
* Copyright (C) 2014 Floens |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU General Public License as published by |
||||
* the Free Software Foundation, either version 3 of the License, or |
||||
* (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/ |
||||
package org.floens.chan.core.model; |
||||
|
||||
import com.j256.ormlite.field.DatabaseField; |
||||
import com.j256.ormlite.table.DatabaseTable; |
||||
|
||||
@DatabaseTable |
||||
public class History { |
||||
@DatabaseField(generatedId = true) |
||||
public int id; |
||||
|
||||
@DatabaseField(canBeNull = false, foreign = true, foreignAutoRefresh = true) |
||||
public Loadable loadable; |
||||
|
||||
@DatabaseField |
||||
public String thumbnailUrl; |
||||
|
||||
@DatabaseField |
||||
public long date; |
||||
} |
||||
@ -1,82 +0,0 @@ |
||||
/* |
||||
* Clover - 4chan browser https://github.com/Floens/Clover/
|
||||
* Copyright (C) 2014 Floens |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU General Public License as published by |
||||
* the Free Software Foundation, either version 3 of the License, or |
||||
* (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/ |
||||
package org.floens.chan.ui; |
||||
|
||||
import android.content.res.Resources; |
||||
import android.graphics.Bitmap; |
||||
import android.graphics.BitmapFactory; |
||||
import android.graphics.Canvas; |
||||
import android.graphics.Paint; |
||||
import android.graphics.Rect; |
||||
import android.graphics.RectF; |
||||
import android.graphics.drawable.BitmapDrawable; |
||||
import android.graphics.drawable.Drawable; |
||||
|
||||
public class BadgeDrawable { |
||||
public static Drawable get(Resources resources, int id, int count, boolean red) { |
||||
BitmapFactory.Options opt = new BitmapFactory.Options(); |
||||
opt.inMutable = true; |
||||
Bitmap bitmap = BitmapFactory.decodeResource(resources, id, opt); |
||||
int w = bitmap.getWidth(); |
||||
int h = bitmap.getHeight(); |
||||
|
||||
Paint paint = new Paint(); |
||||
paint.setAntiAlias(true); |
||||
|
||||
Canvas canvas = new Canvas(bitmap); |
||||
|
||||
float badgeX = w * 0.3f; |
||||
float badgeY = h * 0.3f; |
||||
float badgeW = w * 0.6f; |
||||
float badgeH = h * 0.6f; |
||||
|
||||
RectF rect = new RectF(badgeX, badgeY, badgeX + badgeW, badgeY + badgeH); |
||||
if (red) { |
||||
paint.setColor(0xddff4444); |
||||
} else { |
||||
paint.setColor(0xaa000000); |
||||
} |
||||
canvas.drawRoundRect(rect, w * 0.1f, h * 0.1f, paint); |
||||
|
||||
String text = Integer.toString(count); |
||||
if (count > 999) { |
||||
text = "1k+"; |
||||
} |
||||
|
||||
paint.setColor(0xffffffff); |
||||
|
||||
float textHeight; |
||||
float bottomOffset; |
||||
if (text.length() <= 2) { |
||||
textHeight = badgeH * 0.8f; |
||||
bottomOffset = badgeH * 0.2f; |
||||
} else { |
||||
textHeight = badgeH * 0.5f; |
||||
bottomOffset = badgeH * 0.3f; |
||||
} |
||||
|
||||
paint.setTextSize(textHeight); |
||||
|
||||
Rect bounds = new Rect(); |
||||
paint.getTextBounds(text, 0, text.length(), bounds); |
||||
|
||||
canvas.drawText(text, badgeX + badgeW / 2f - bounds.right / 2f, badgeY + badgeH - bottomOffset, paint); |
||||
|
||||
return new BitmapDrawable(resources, bitmap); |
||||
} |
||||
} |
||||
@ -0,0 +1,244 @@ |
||||
/* |
||||
* Clover - 4chan browser https://github.com/Floens/Clover/
|
||||
* Copyright (C) 2014 Floens |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU General Public License as published by |
||||
* the Free Software Foundation, either version 3 of the License, or |
||||
* (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/ |
||||
package org.floens.chan.ui.controller; |
||||
|
||||
import android.app.AlertDialog; |
||||
import android.content.Context; |
||||
import android.content.DialogInterface; |
||||
import android.support.v7.widget.LinearLayoutManager; |
||||
import android.support.v7.widget.RecyclerView; |
||||
import android.support.v7.widget.SwitchCompat; |
||||
import android.text.TextUtils; |
||||
import android.view.LayoutInflater; |
||||
import android.view.View; |
||||
import android.view.ViewGroup; |
||||
import android.widget.CompoundButton; |
||||
import android.widget.ImageView; |
||||
import android.widget.TextView; |
||||
|
||||
import org.floens.chan.Chan; |
||||
import org.floens.chan.R; |
||||
import org.floens.chan.controller.Controller; |
||||
import org.floens.chan.core.database.DatabaseManager; |
||||
import org.floens.chan.core.model.Board; |
||||
import org.floens.chan.core.model.History; |
||||
import org.floens.chan.core.settings.ChanSettings; |
||||
import org.floens.chan.ui.toolbar.ToolbarMenu; |
||||
import org.floens.chan.ui.toolbar.ToolbarMenuItem; |
||||
import org.floens.chan.ui.view.FloatingMenuItem; |
||||
import org.floens.chan.ui.view.ThumbnailView; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
import java.util.Locale; |
||||
|
||||
import static org.floens.chan.ui.theme.ThemeHelper.theme; |
||||
import static org.floens.chan.utils.AndroidUtils.dp; |
||||
|
||||
public class HistoryController extends Controller implements CompoundButton.OnCheckedChangeListener, ToolbarMenuItem.ToolbarMenuItemCallback, RootNavigationController.ToolbarSearchCallback { |
||||
private static final int SEARCH_ID = 1; |
||||
private static final int CLEAR_ID = 101; |
||||
|
||||
private DatabaseManager databaseManager; |
||||
private RecyclerView recyclerView; |
||||
private HistoryAdapter adapter; |
||||
|
||||
public HistoryController(Context context) { |
||||
super(context); |
||||
} |
||||
|
||||
@Override |
||||
public void onCreate() { |
||||
super.onCreate(); |
||||
|
||||
databaseManager = Chan.getDatabaseManager(); |
||||
|
||||
navigationItem.title = string(R.string.history_screen); |
||||
List<FloatingMenuItem> items = new ArrayList<>(); |
||||
items.add(new FloatingMenuItem(CLEAR_ID, R.string.history_clear)); |
||||
navigationItem.menu = new ToolbarMenu(context); |
||||
navigationItem.menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp)); |
||||
navigationItem.createOverflow(context, this, items); |
||||
|
||||
view = inflateRes(R.layout.controller_history); |
||||
|
||||
SwitchCompat globalSwitch = new SwitchCompat(context); |
||||
globalSwitch.setChecked(ChanSettings.historyEnabled.get()); |
||||
globalSwitch.setOnCheckedChangeListener(this); |
||||
navigationItem.rightView = globalSwitch; |
||||
|
||||
recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view); |
||||
recyclerView.setHasFixedSize(true); |
||||
recyclerView.setLayoutManager(new LinearLayoutManager(context)); |
||||
|
||||
adapter = new HistoryAdapter(); |
||||
recyclerView.setAdapter(adapter); |
||||
adapter.load(); |
||||
} |
||||
|
||||
@Override |
||||
public void onMenuItemClicked(ToolbarMenuItem item) { |
||||
if ((Integer) item.getId() == SEARCH_ID) { |
||||
navigationController.showSearch(); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public void onSubMenuItemClicked(ToolbarMenuItem parent, FloatingMenuItem item) { |
||||
if ((Integer) item.getId() == CLEAR_ID) { |
||||
new AlertDialog.Builder(context) |
||||
.setTitle(R.string.history_clear_confirm) |
||||
.setNegativeButton(R.string.cancel, null) |
||||
.setPositiveButton(R.string.history_clear_confirm_button, new DialogInterface.OnClickListener() { |
||||
@Override |
||||
public void onClick(DialogInterface dialog, int which) { |
||||
databaseManager.clearHistory(); |
||||
adapter.load(); |
||||
} |
||||
}) |
||||
.show(); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { |
||||
ChanSettings.historyEnabled.set(isChecked); |
||||
} |
||||
|
||||
private void openThread(History history) { |
||||
ViewThreadController viewThreadController = new ViewThreadController(context); |
||||
viewThreadController.setLoadable(history.loadable); |
||||
navigationController.pushController(viewThreadController); |
||||
} |
||||
|
||||
private void deleteHistory(History history) { |
||||
databaseManager.removeHistory(history); |
||||
adapter.load(); |
||||
} |
||||
|
||||
@Override |
||||
public void onSearchVisibilityChanged(boolean visible) { |
||||
if (!visible) { |
||||
adapter.search(null); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public void onSearchEntered(String entered) { |
||||
adapter.search(entered); |
||||
} |
||||
|
||||
private class HistoryAdapter extends RecyclerView.Adapter<HistoryCell> { |
||||
private List<History> sourceList = new ArrayList<>(); |
||||
private List<History> displayList = new ArrayList<>(); |
||||
private String searchQuery; |
||||
|
||||
public HistoryAdapter() { |
||||
setHasStableIds(true); |
||||
} |
||||
|
||||
@Override |
||||
public HistoryCell onCreateViewHolder(ViewGroup parent, int viewType) { |
||||
return new HistoryCell(LayoutInflater.from(parent.getContext()).inflate(R.layout.cell_history, parent, false)); |
||||
} |
||||
|
||||
@Override |
||||
public void onBindViewHolder(HistoryCell holder, int position) { |
||||
History history = displayList.get(position); |
||||
holder.thumbnail.setUrl(history.thumbnailUrl, dp(48), dp(48)); |
||||
holder.text.setText(history.loadable.title); |
||||
Board board = Chan.getBoardManager().getBoardByValue(history.loadable.board); |
||||
holder.subtext.setText(board == null ? null : ("/" + board.value + "/ - " + board.key)); |
||||
} |
||||
|
||||
@Override |
||||
public int getItemCount() { |
||||
return displayList.size(); |
||||
} |
||||
|
||||
@Override |
||||
public long getItemId(int position) { |
||||
return displayList.get(position).id; |
||||
} |
||||
|
||||
public void search(String query) { |
||||
this.searchQuery = query; |
||||
filter(); |
||||
} |
||||
|
||||
private void load() { |
||||
sourceList.clear(); |
||||
sourceList.addAll(databaseManager.getHistory()); |
||||
|
||||
filter(); |
||||
} |
||||
|
||||
private void filter() { |
||||
displayList.clear(); |
||||
if (!TextUtils.isEmpty(searchQuery)) { |
||||
String query = searchQuery.toLowerCase(Locale.ENGLISH); |
||||
for (History history : sourceList) { |
||||
if (history.loadable.title.toLowerCase(Locale.ENGLISH).contains(query)) { |
||||
displayList.add(history); |
||||
} |
||||
} |
||||
} else { |
||||
displayList.addAll(sourceList); |
||||
} |
||||
|
||||
notifyDataSetChanged(); |
||||
} |
||||
} |
||||
|
||||
private class HistoryCell extends RecyclerView.ViewHolder implements View.OnClickListener { |
||||
private ThumbnailView thumbnail; |
||||
private TextView text; |
||||
private TextView subtext; |
||||
private ImageView delete; |
||||
|
||||
public HistoryCell(View itemView) { |
||||
super(itemView); |
||||
|
||||
thumbnail = (ThumbnailView) itemView.findViewById(R.id.thumbnail); |
||||
thumbnail.setCircular(true); |
||||
text = (TextView) itemView.findViewById(R.id.text); |
||||
subtext = (TextView) itemView.findViewById(R.id.subtext); |
||||
delete = (ImageView) itemView.findViewById(R.id.delete); |
||||
|
||||
theme().clearDrawable.apply(delete); |
||||
|
||||
delete.setOnClickListener(this); |
||||
|
||||
itemView.setOnClickListener(this); |
||||
} |
||||
|
||||
@Override |
||||
public void onClick(View v) { |
||||
int position = getAdapterPosition(); |
||||
if (position >= 0 && position < adapter.getItemCount()) { |
||||
History history = adapter.displayList.get(position); |
||||
if (v == itemView) { |
||||
openThread(history); |
||||
} else if (v == delete) { |
||||
deleteHistory(history); |
||||
} |
||||
} |
||||
|
||||
} |
||||
} |
||||
} |
||||
|
After Width: | Height: | Size: 396 B |
|
After Width: | Height: | Size: 247 B |
|
After Width: | Height: | Size: 465 B |
|
After Width: | Height: | Size: 728 B |
|
After Width: | Height: | Size: 915 B |
@ -0,0 +1,92 @@ |
||||
<?xml version="1.0" encoding="utf-8"?><!-- |
||||
Clover - 4chan browser https://github.com/Floens/Clover/ |
||||
Copyright (C) 2014 Floens |
||||
|
||||
This program is free software: you can redistribute it and/or modify |
||||
it under the terms of the GNU General Public License as published by |
||||
the Free Software Foundation, either version 3 of the License, or |
||||
(at your option) any later version. |
||||
|
||||
This program is distributed in the hope that it will be useful, |
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
GNU General Public License for more details. |
||||
|
||||
You should have received a copy of the GNU General Public License |
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
--> |
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
||||
xmlns:tools="http://schemas.android.com/tools" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:background="@drawable/item_background" |
||||
android:orientation="vertical"> |
||||
|
||||
<LinearLayout |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:orientation="horizontal"> |
||||
|
||||
<org.floens.chan.ui.view.ThumbnailView |
||||
android:id="@+id/thumbnail" |
||||
android:layout_width="48dp" |
||||
android:layout_height="48dp" |
||||
android:layout_gravity="center_vertical" |
||||
android:paddingBottom="4dp" |
||||
android:paddingLeft="4dp" |
||||
android:paddingRight="4dp" |
||||
android:paddingTop="4dp" /> |
||||
|
||||
<LinearLayout |
||||
android:layout_width="0dp" |
||||
android:layout_height="wrap_content" |
||||
android:layout_weight="1" |
||||
android:orientation="vertical"> |
||||
|
||||
<TextView |
||||
android:id="@+id/text" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:ellipsize="end" |
||||
android:paddingLeft="16dp" |
||||
android:paddingRight="16dp" |
||||
android:paddingTop="8dp" |
||||
android:singleLine="true" |
||||
android:textColor="?text_color_primary" |
||||
android:textSize="14sp" /> |
||||
|
||||
<TextView |
||||
android:id="@+id/subtext" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:paddingBottom="8dp" |
||||
android:paddingLeft="16dp" |
||||
android:paddingRight="16dp" |
||||
android:textColor="?text_color_secondary" |
||||
android:textSize="12sp" /> |
||||
|
||||
</LinearLayout> |
||||
|
||||
<ImageView |
||||
android:id="@+id/delete" |
||||
android:layout_width="32dp" |
||||
android:layout_height="32dp" |
||||
android:layout_gravity="center_vertical" |
||||
android:paddingBottom="4dp" |
||||
android:paddingLeft="4dp" |
||||
android:paddingRight="4dp" |
||||
android:paddingTop="4dp" |
||||
tools:ignore="ContentDescription" /> |
||||
|
||||
</LinearLayout> |
||||
|
||||
<View |
||||
android:id="@+id/divider" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="1dp" |
||||
android:layout_alignParentBottom="true" |
||||
android:layout_alignParentLeft="true" |
||||
android:layout_alignParentRight="true" |
||||
android:background="?attr/divider_color" /> |
||||
|
||||
</LinearLayout> |
||||
@ -0,0 +1,26 @@ |
||||
<?xml version="1.0" encoding="utf-8"?><!-- |
||||
Clover - 4chan browser https://github.com/Floens/Clover/ |
||||
Copyright (C) 2014 Floens |
||||
|
||||
This program is free software: you can redistribute it and/or modify |
||||
it under the terms of the GNU General Public License as published by |
||||
the Free Software Foundation, either version 3 of the License, or |
||||
(at your option) any later version. |
||||
|
||||
This program is distributed in the hope that it will be useful, |
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
GNU General Public License for more details. |
||||
|
||||
You should have received a copy of the GNU General Public License |
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
--> |
||||
<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" |
||||
android:id="@+id/recycler_view" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:background="?backcolor" |
||||
android:clipToPadding="false" |
||||
android:padding="16dp" |
||||
android:scrollbarStyle="outsideOverlay" |
||||
android:scrollbars="vertical" /> |
||||
Loading…
Reference in new issue