material^2
Floens 11 years ago
parent 7154c35695
commit d2e2538050
  1. 2
      Clover/app/src/main/java/org/floens/chan/chan/ImageSearch.java
  2. 2
      Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java
  3. 2
      Clover/app/src/main/java/org/floens/chan/ui/activity/AdvancedSettingsActivity.java
  4. 2
      Clover/app/src/main/java/org/floens/chan/ui/activity/BaseActivity.java
  5. 2
      Clover/app/src/main/java/org/floens/chan/ui/activity/BoardEditor.java
  6. 4
      Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
  7. 2
      Clover/app/src/main/java/org/floens/chan/ui/activity/ReplyActivity.java
  8. 2
      Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java
  9. 5
      Clover/app/src/main/res/anim/fade_in.xml
  10. 5
      Clover/app/src/main/res/anim/fade_out.xml
  11. 12
      Clover/app/src/main/res/drawable/pin_icon_blue.xml
  12. 12
      Clover/app/src/main/res/drawable/pin_icon_gray.xml
  13. 12
      Clover/app/src/main/res/drawable/pin_icon_red.xml
  14. 10
      Clover/app/src/main/res/layout/board_edit_item.xml
  15. 8
      Clover/app/src/main/res/layout/board_select_add.xml
  16. 8
      Clover/app/src/main/res/layout/board_select_spinner.xml
  17. 8
      Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml
  18. 2
      Clover/app/src/main/res/layout/folder_pick.xml
  19. 2
      Clover/app/src/main/res/layout/image_view.xml
  20. 5
      Clover/app/src/main/res/menu/settings.xml
  21. 3
      Clover/app/src/main/res/values/colors.xml
  22. 3
      Clover/app/src/main/res/values/dimens.xml
  23. 3
      Clover/app/src/main/res/values/strings.xml
  24. 9
      Clover/app/src/main/res/xml/preference_pass.xml

@ -26,7 +26,9 @@ public abstract class ImageSearch {
public static final List<ImageSearch> engines = new ArrayList<>();
public abstract int getId();
public abstract String getName();
public abstract String getUrl(String imageUrl);
static {

@ -57,7 +57,7 @@ public class PostLinkable extends ClickableSpan {
public void updateDrawState(TextPaint ds) {
if (type == Type.QUOTE || type == Type.LINK || type == Type.THREAD) {
if (type == Type.QUOTE) {
if (value instanceof Integer && post.getLinkableListener() != null && (Integer)value == post.getLinkableListener().getHighlightQuotesWithNo()) {
if (value instanceof Integer && post.getLinkableListener() != null && (Integer) value == post.getLinkableListener().getHighlightQuotesWithNo()) {
ds.setColor(ThemeHelper.getInstance().getHighlightQuoteColor());
} else {
ds.setColor(ThemeHelper.getInstance().getQuoteColor());

@ -114,7 +114,7 @@ public class AdvancedSettingsActivity extends ThemeActivity {
findPreference("preference_network_https").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
ChanUrls.loadScheme((Boolean)newValue);
ChanUrls.loadScheme((Boolean) newValue);
return true;
}

@ -115,7 +115,7 @@ public abstract class BaseActivity extends ThemeActivity implements PanelSlideLi
@Override
public void onBackPressed() {
if(pinDrawer.isDrawerOpen(pinDrawerView)) {
if (pinDrawer.isDrawerOpen(pinDrawerView)) {
pinDrawer.closeDrawer(pinDrawerView);
} else {
super.onBackPressed();

@ -152,7 +152,7 @@ public class BoardEditor extends ThemeActivity {
}
});
((ViewGroup)findViewById(R.id.content)).addView(listView);
((ViewGroup) findViewById(R.id.content)).addView(listView);
}
@Override

@ -201,7 +201,7 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
@Override
public void onBackPressed() {
if(pinDrawer.isDrawerOpen(pinDrawerView)) {
if (pinDrawer.isDrawerOpen(pinDrawerView)) {
pinDrawer.closeDrawer(pinDrawerView);
} else {
if (threadPane.isOpen()) {
@ -487,7 +487,7 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
Loader loader = threadFragment.getLoader();
if (loader != null && loader.getLoadable().isThreadMode() && loader.getThread() != null) {
Pin pin = ChanApplication.getWatchManager().findPinByLoadable(threadLoadable);
if(pin != null) {
if (pin != null) {
ChanApplication.getWatchManager().removePin(pin);
} else {
ChanApplication.getWatchManager().addPin(loader.getLoadable(), loader.getThread().op);

@ -62,7 +62,7 @@ public class ReplyActivity extends ThemeActivity {
@Override
public void onBackPressed() {
Fragment f = getFragmentManager().findFragmentByTag("reply");
if (f != null && ((ReplyFragment)f).onBackPressed()) {
if (f != null && ((ReplyFragment) f).onBackPressed()) {
super.onBackPressed();
}
}

@ -242,7 +242,7 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
break;
case R.id.action_image_save:
case R.id.action_share:
if(ChanPreferences.getImageShareUrl()) {
if (ChanPreferences.getImageShareUrl()) {
shareImageUrl(post.imageUrl);
} else {
ImageSaver.getInstance().saveImage(context, post.imageUrl,

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -20,5 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:duration="200"/>
android:duration="200" />
</set>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -20,5 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<alpha
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:duration="200"/>
android:duration="200" />
</set>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -16,16 +15,13 @@ 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/>.
-->
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="8dp"
android:insetTop="8dp"
android:insetRight="8dp"
android:insetBottom="8dp">
<shape>
<solid
android:color="#FF33B5E5"/>
<corners
android:radius="4dp"/>
<solid android:color="#FF33B5E5" />
<corners android:radius="4dp" />
</shape>
</inset>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -16,16 +15,13 @@ 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/>.
-->
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="8dp"
android:insetTop="8dp"
android:insetRight="8dp"
android:insetBottom="8dp">
<shape>
<solid
android:color="#FF898989"/>
<corners
android:radius="4dp"/>
<solid android:color="#FF898989" />
<corners android:radius="4dp" />
</shape>
</inset>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -16,16 +15,13 @@ 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/>.
-->
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="8dp"
android:insetTop="8dp"
android:insetRight="8dp"
android:insetBottom="8dp">
<shape>
<solid
android:color="#FFFF4444"/>
<corners
android:radius="4dp"/>
<solid android:color="#FFFF4444" />
<corners android:radius="4dp" />
</shape>
</inset>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -16,8 +15,7 @@ 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/>.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
@ -30,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:paddingBottom="12dp"
android:paddingLeft="16dp"
android:paddingTop="12dp"
style="?attr/board_edit_item_style"/>
style="?attr/board_edit_item_style" />
<TextView
android:id="@+id/text"
@ -39,6 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_marginLeft="36dp"
android:gravity="center_vertical"
android:minHeight="50sp"
android:textSize="24sp"/>
android:textSize="24sp" />
</FrameLayout>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -16,8 +15,7 @@ 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/>.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -29,4 +27,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:textStyle="italic"
android:singleLine="true"
android:ellipsize="end"/>
android:ellipsize="end" />

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -16,8 +15,7 @@ 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/>.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -28,4 +26,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:singleLine="true"
android:ellipsize="end"/>
android:ellipsize="end" />

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -16,8 +15,7 @@ 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/>.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -28,4 +26,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:singleLine="true"
android:ellipsize="end"/>
android:ellipsize="end" />

@ -85,7 +85,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<View
android:layout_width="fill_parent"
android:layout_height="3dp"
android:background="@android:color/darker_gray"/>
android:background="@android:color/darker_gray" />
<ListView
android:id="@+id/folder_list"

@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-19px"/>
android:layout_marginTop="-7dp" />
</FrameLayout>
</LinearLayout>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -22,5 +21,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/action_settings_advanced"
android:orderInCategory="1"
app:showAsAction="never"
android:title="@string/action_settings_advanced"/>
android:title="@string/action_settings_advanced" />
</menu>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Clover - 4chan browser https://github.com/Floens/Clover/
Copyright (C) 2014 Floens
@ -20,15 +19,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<EditTextPreference
android:key="preference_pass_token"
android:title="@string/pass_token"/>
android:title="@string/pass_token" />
<EditTextPreference
android:key="preference_pass_pin"
android:title="@string/pass_pin"
android:inputType="numberPassword"/>
android:inputType="numberPassword" />
<Preference
android:key="preference_pass_login"
android:title="@string/pass_login"/>
android:title="@string/pass_login" />
</PreferenceScreen>

Loading…
Cancel
Save