From 18cb729d3ea270bb531dc6d63d9d60c9dc5a117b Mon Sep 17 00:00:00 2001 From: Florens Douwes Date: Thu, 5 Jun 2014 20:40:34 +0200 Subject: [PATCH] Cleanup res/ folder. Add license headers. --- .../debug/java/org/floens/chan/ChanBuild.java | 17 ++++ Clover/app/src/main/AndroidManifest.xml | 88 ++++++++++-------- .../org/floens/chan/utils/ThemeHelper.java | 17 ++++ Clover/app/src/main/res/anim/fade_in.xml | 26 ++++-- Clover/app/src/main/res/anim/fade_out.xml | 26 ++++-- .../src/main/res/drawable/pin_icon_blue.xml | 33 +++++-- .../src/main/res/drawable/pin_icon_gray.xml | 33 +++++-- .../src/main/res/drawable/pin_icon_red.xml | 33 +++++-- .../app/src/main/res/layout/activity_base.xml | 31 +++++-- .../src/main/res/layout/board_edit_item.xml | 24 ++++- .../src/main/res/layout/board_select_add.xml | 18 +++- .../main/res/layout/board_select_spinner.xml | 18 +++- .../app/src/main/res/layout/image_pager.xml | 33 +++++-- Clover/app/src/main/res/layout/pin_item.xml | 89 +++++++++++-------- .../src/main/res/layout/pin_item_header.xml | 43 ++++++--- .../app/src/main/res/layout/post_replies.xml | 17 ++++ .../src/main/res/layout/preference_pass.xml | 26 +++++- .../app/src/main/res/layout/reply_captcha.xml | 28 ++++-- .../app/src/main/res/layout/reply_input.xml | 40 ++++++--- Clover/app/src/main/res/layout/reply_view.xml | 44 ++++++--- .../src/main/res/menu/action_bar_switch.xml | 19 +++- Clover/app/src/main/res/menu/base.xml | 71 +++++++++------ Clover/app/src/main/res/menu/board_edit.xml | 33 +++++-- Clover/app/src/main/res/menu/image_view.xml | 19 +++- .../src/main/res/values-sw600dp/dimens.xml | 8 -- .../main/res/values-sw720dp-land/dimens.xml | 8 -- Clover/app/src/main/res/values/attrs.xml | 25 +++++- Clover/app/src/main/res/values/colors.xml | 17 ++++ Clover/app/src/main/res/values/dimens.xml | 24 ++++- Clover/app/src/main/res/values/strings.xml | 19 +++- Clover/app/src/main/res/values/styles.xml | 17 ++++ Clover/app/src/main/res/xml/preference.xml | 55 ++++++++---- .../app/src/main/res/xml/preference_pass.xml | 37 +++++--- .../app/src/main/res/xml/preference_watch.xml | 23 ++++- .../java/org/floens/chan/ChanBuild.java | 17 ++++ docs/FileNotice.txt | 18 ++++ 36 files changed, 830 insertions(+), 264 deletions(-) delete mode 100644 Clover/app/src/main/res/values-sw600dp/dimens.xml delete mode 100644 Clover/app/src/main/res/values-sw720dp-land/dimens.xml diff --git a/Clover/app/src/debug/java/org/floens/chan/ChanBuild.java b/Clover/app/src/debug/java/org/floens/chan/ChanBuild.java index 7099ed20..2029f65f 100644 --- a/Clover/app/src/debug/java/org/floens/chan/ChanBuild.java +++ b/Clover/app/src/debug/java/org/floens/chan/ChanBuild.java @@ -1,3 +1,20 @@ +/* + * 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 . + */ package org.floens.chan; // debug version diff --git a/Clover/app/src/main/AndroidManifest.xml b/Clover/app/src/main/AndroidManifest.xml index 1e36c626..0ffe1cf0 100644 --- a/Clover/app/src/main/AndroidManifest.xml +++ b/Clover/app/src/main/AndroidManifest.xml @@ -1,125 +1,143 @@ -. +--> + + android:installLocation="auto"> + android:targetSdkVersion="19"/> - - - + + + + android:theme="@style/AppTheme"> + android:label="@string/app_name"> - + - + - - + + - - + + + android:scheme="http"/> + android:scheme="https"/> + android:scheme="http"/> + android:scheme="https"/> + android:scheme="http"/> + android:scheme="https"/> + android:windowSoftInputMode="adjustResize"> + android:parentActivityName="org.floens.chan.ui.activity.BoardActivity"> + android:value="org.floens.chan.ui.activity.BoardActivity"/> + android:parentActivityName="org.floens.chan.ui.activity.BoardActivity"> + android:value="org.floens.chan.ui.activity.BoardActivity"/> + android:parentActivityName="org.floens.chan.ui.activity.BoardActivity"> + android:value="org.floens.chan.ui.activity.BoardActivity"/> + android:parentActivityName="org.floens.chan.ui.activity.BoardActivity"> + android:value="org.floens.chan.ui.activity.BoardActivity"/> + android:parentActivityName="org.floens.chan.ui.activity.BoardActivity"> + android:value="org.floens.chan.ui.activity.BoardActivity"/> + android:theme="@style/Theme.ImageList"> - + - + + android:exported="false"> diff --git a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java index 73945fea..606ef74a 100644 --- a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java +++ b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java @@ -1,3 +1,20 @@ +/* + * 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 . + */ package org.floens.chan.utils; import android.app.Activity; diff --git a/Clover/app/src/main/res/anim/fade_in.xml b/Clover/app/src/main/res/anim/fade_in.xml index 8e93b474..0cf24af2 100644 --- a/Clover/app/src/main/res/anim/fade_in.xml +++ b/Clover/app/src/main/res/anim/fade_in.xml @@ -1,8 +1,24 @@ - - + + + diff --git a/Clover/app/src/main/res/anim/fade_out.xml b/Clover/app/src/main/res/anim/fade_out.xml index 9304f981..433fad24 100644 --- a/Clover/app/src/main/res/anim/fade_out.xml +++ b/Clover/app/src/main/res/anim/fade_out.xml @@ -1,8 +1,24 @@ - - + + + diff --git a/Clover/app/src/main/res/drawable/pin_icon_blue.xml b/Clover/app/src/main/res/drawable/pin_icon_blue.xml index 9d461dc5..25ab8714 100644 --- a/Clover/app/src/main/res/drawable/pin_icon_blue.xml +++ b/Clover/app/src/main/res/drawable/pin_icon_blue.xml @@ -1,16 +1,31 @@ -. +--> + + android:insetBottom="8dp"> - - - - + + - diff --git a/Clover/app/src/main/res/drawable/pin_icon_gray.xml b/Clover/app/src/main/res/drawable/pin_icon_gray.xml index 6ffc7d91..a48eb43a 100644 --- a/Clover/app/src/main/res/drawable/pin_icon_gray.xml +++ b/Clover/app/src/main/res/drawable/pin_icon_gray.xml @@ -1,16 +1,31 @@ -. +--> + + android:insetBottom="8dp"> - - - - + + - diff --git a/Clover/app/src/main/res/drawable/pin_icon_red.xml b/Clover/app/src/main/res/drawable/pin_icon_red.xml index 9e9044f1..eb1f09c4 100644 --- a/Clover/app/src/main/res/drawable/pin_icon_red.xml +++ b/Clover/app/src/main/res/drawable/pin_icon_red.xml @@ -1,16 +1,31 @@ -. +--> + + android:insetBottom="8dp"> - - - - + + - diff --git a/Clover/app/src/main/res/layout/activity_base.xml b/Clover/app/src/main/res/layout/activity_base.xml index 17470dd1..807c7e20 100644 --- a/Clover/app/src/main/res/layout/activity_base.xml +++ b/Clover/app/src/main/res/layout/activity_base.xml @@ -1,18 +1,37 @@ - + + + android:layout_height="match_parent"> + android:layout_height="match_parent"> + style="?board_pane_left_style"/> + android:dividerHeight="1dp"/> - \ No newline at end of file + diff --git a/Clover/app/src/main/res/layout/board_edit_item.xml b/Clover/app/src/main/res/layout/board_edit_item.xml index e147e3f5..ea8e2c3d 100644 --- a/Clover/app/src/main/res/layout/board_edit_item.xml +++ b/Clover/app/src/main/res/layout/board_edit_item.xml @@ -1,8 +1,26 @@ -. +--> + + android:orientation="horizontal"> + android:textSize="24sp"/> diff --git a/Clover/app/src/main/res/layout/board_select_add.xml b/Clover/app/src/main/res/layout/board_select_add.xml index 03d7d368..1b76c3aa 100644 --- a/Clover/app/src/main/res/layout/board_select_add.xml +++ b/Clover/app/src/main/res/layout/board_select_add.xml @@ -1,5 +1,21 @@ + + android:ellipsize="end"/> diff --git a/Clover/app/src/main/res/layout/board_select_spinner.xml b/Clover/app/src/main/res/layout/board_select_spinner.xml index bb0aeb76..303ad9ae 100644 --- a/Clover/app/src/main/res/layout/board_select_spinner.xml +++ b/Clover/app/src/main/res/layout/board_select_spinner.xml @@ -1,5 +1,21 @@ + + android:ellipsize="end"/> diff --git a/Clover/app/src/main/res/layout/image_pager.xml b/Clover/app/src/main/res/layout/image_pager.xml index ce0127e5..08bd2fc2 100644 --- a/Clover/app/src/main/res/layout/image_pager.xml +++ b/Clover/app/src/main/res/layout/image_pager.xml @@ -1,14 +1,33 @@ -. +--> + + android:orientation="vertical"> - - + + \ No newline at end of file diff --git a/Clover/app/src/main/res/layout/pin_item.xml b/Clover/app/src/main/res/layout/pin_item.xml index 651ece93..0fa508a7 100644 --- a/Clover/app/src/main/res/layout/pin_item.xml +++ b/Clover/app/src/main/res/layout/pin_item.xml @@ -1,41 +1,58 @@ -. +--> + - - - - - - - - - - + android:orientation="horizontal"> + + + + + + + + + + diff --git a/Clover/app/src/main/res/layout/pin_item_header.xml b/Clover/app/src/main/res/layout/pin_item_header.xml index a6394d39..ed59a004 100644 --- a/Clover/app/src/main/res/layout/pin_item_header.xml +++ b/Clover/app/src/main/res/layout/pin_item_header.xml @@ -1,15 +1,34 @@ -. +--> + - + android:layout_height="wrap_content"> + + diff --git a/Clover/app/src/main/res/layout/post_replies.xml b/Clover/app/src/main/res/layout/post_replies.xml index 7ca33482..6f7bca10 100644 --- a/Clover/app/src/main/res/layout/post_replies.xml +++ b/Clover/app/src/main/res/layout/post_replies.xml @@ -1,4 +1,21 @@ + -. +--> + + android:gravity="center"> + android:textSize="24sp"/> + android:textStyle="italic"/> \ No newline at end of file diff --git a/Clover/app/src/main/res/layout/reply_captcha.xml b/Clover/app/src/main/res/layout/reply_captcha.xml index 6bf95a00..c5779f91 100644 --- a/Clover/app/src/main/res/layout/reply_captcha.xml +++ b/Clover/app/src/main/res/layout/reply_captcha.xml @@ -1,28 +1,46 @@ -. +--> + + android:padding="8dp"> + android:textSize="16sp"/> + android:layout_gravity="center"/> + android:inputType="textNoSuggestions"/> diff --git a/Clover/app/src/main/res/layout/reply_input.xml b/Clover/app/src/main/res/layout/reply_input.xml index 156529d8..6999ee0c 100644 --- a/Clover/app/src/main/res/layout/reply_input.xml +++ b/Clover/app/src/main/res/layout/reply_input.xml @@ -1,11 +1,29 @@ -. +--> + + android:orientation="vertical"> + android:textSize="16sp"/> + floatlabel:textSize="16sp"/> + floatlabel:textSize="16sp"/> + floatlabel:textSize="16sp"/> + android:orientation="vertical"> + android:orientation="horizontal">