diff --git a/.classpath b/.classpath deleted file mode 100644 index aa361afe..00000000 --- a/.classpath +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index ac468d1a..eca7ace6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,12 @@ -/gen -/bin +bin/ +gen/ +.gradle/ +build/ +local.properties +import-summary.txt Thumbs.db +.idea/workspace.xml +.idea/tasks.xml +.idea/datasources.xml +.idea/dataSources.ids +.idea/libraries diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..4dbe2d86 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Tiny-Tiny-RSS-for-Honeycomb \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..217af471 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..e206d70d --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..99d0e7b4 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..671eadea --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + Android API 19 Platform + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..d3fd72d4 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..def6a6a1 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.project b/.project deleted file mode 100644 index 4a90fe22..00000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - org.fox.ttrss - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ef1b5552..00000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/org/fox/ttrss/util/EnlargingImageView.java=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 54e493c0..00000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/README.md b/README.md deleted file mode 100644 index 29693349..00000000 --- a/README.md +++ /dev/null @@ -1,24 +0,0 @@ -Tiny Tiny RSS client for Android -================================ - -http://tt-rss.org/tt-rss-android - -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 . - -Copyright (c) 2011 Andrew Dolgov (unless explicitly stated otherwise). - -## See also - -* FAQ: http://tt-rss.org/redmine/projects/tt-rss-android/wiki/#FAQ -* Forum: http://tt-rss.org/forum diff --git a/Tiny-Tiny-RSS-for-Honeycomb.iml b/Tiny-Tiny-RSS-for-Honeycomb.iml new file mode 100644 index 00000000..0bb6048a --- /dev/null +++ b/Tiny-Tiny-RSS-for-Honeycomb.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..aa6500ab --- /dev/null +++ b/build.gradle @@ -0,0 +1,17 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.12.2' + } +} + +allprojects { + repositories { + maven { url "http://dl.bintray.com/populov/maven" } + maven { url "http://jzaccone.github.io/SlidingMenu-aar" } + jcenter() + } +} diff --git a/default.properties b/default.properties deleted file mode 100644 index ede6e6b8..00000000 --- a/default.properties +++ /dev/null @@ -1,2 +0,0 @@ -# Project target. -target=android-14 diff --git a/feature_graphic.png b/feature_graphic.png deleted file mode 100644 index ba9f4ae1..00000000 Binary files a/feature_graphic.png and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8c0fb64a Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1e61d1fd --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..91a7e269 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/ic_launcher-web.png b/ic_launcher-web.png deleted file mode 100644 index 9da5905c..00000000 Binary files a/ic_launcher-web.png and /dev/null differ diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar deleted file mode 100644 index c31cede4..00000000 Binary files a/libs/android-support-v4.jar and /dev/null differ diff --git a/libs/gson-1.7.1.jar b/libs/gson-1.7.1.jar deleted file mode 100644 index acd16c06..00000000 Binary files a/libs/gson-1.7.1.jar and /dev/null differ diff --git a/lint.xml b/lint.xml deleted file mode 100644 index ee0eead5..00000000 --- a/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/orgfoxttrss/build.gradle b/orgfoxttrss/build.gradle new file mode 100644 index 00000000..82b24493 --- /dev/null +++ b/orgfoxttrss/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 19 + buildToolsVersion "20.0.0" + + defaultConfig { + applicationId "org.fox.ttrss" + minSdkVersion 8 + targetSdkVersion 19 + } + + buildTypes { + release { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + //compile project(':slidingMenulibrary') + compile 'com.jeremyfeinstein.slidingmenu:library:1.3@aar' + compile 'com.readystatesoftware.systembartint:systembartint:1.0.3' + compile 'com.viewpagerindicator:library:2.4.1' + compile 'com.android.support:support-v4:19.1.0' + compile 'com.google.code.gson:gson:1.7.1' + compile 'com.android.support:appcompat-v7:18.0.0' + compile files('libs/dashclock-api-r1.1.jar') + compile files('libs/jsoup-1.6.1.jar') + compile files('libs/universal-image-loader-1.9.3.jar') +} diff --git a/libs/dashclock-api-r1.1.jar b/orgfoxttrss/libs/dashclock-api-r1.1.jar similarity index 100% rename from libs/dashclock-api-r1.1.jar rename to orgfoxttrss/libs/dashclock-api-r1.1.jar diff --git a/libs/jsoup-1.6.1.jar b/orgfoxttrss/libs/jsoup-1.6.1.jar similarity index 100% rename from libs/jsoup-1.6.1.jar rename to orgfoxttrss/libs/jsoup-1.6.1.jar diff --git a/libs/universal-image-loader-1.9.3.jar b/orgfoxttrss/libs/universal-image-loader-1.9.3.jar similarity index 100% rename from libs/universal-image-loader-1.9.3.jar rename to orgfoxttrss/libs/universal-image-loader-1.9.3.jar diff --git a/orgfoxttrss/lint.xml b/orgfoxttrss/lint.xml new file mode 100644 index 00000000..8423c0ef --- /dev/null +++ b/orgfoxttrss/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/orgfoxttrss/orgfoxttrss.iml b/orgfoxttrss/orgfoxttrss.iml new file mode 100644 index 00000000..0a72db93 --- /dev/null +++ b/orgfoxttrss/orgfoxttrss.iml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndroidManifest.xml b/orgfoxttrss/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to orgfoxttrss/src/main/AndroidManifest.xml diff --git a/src/android/support/v4/app/ClassloaderWorkaroundFragmentStatePagerAdapter.java b/orgfoxttrss/src/main/java/android/support/v4/app/ClassloaderWorkaroundFragmentStatePagerAdapter.java similarity index 96% rename from src/android/support/v4/app/ClassloaderWorkaroundFragmentStatePagerAdapter.java rename to orgfoxttrss/src/main/java/android/support/v4/app/ClassloaderWorkaroundFragmentStatePagerAdapter.java index c86e16d7..dd67d599 100644 --- a/src/android/support/v4/app/ClassloaderWorkaroundFragmentStatePagerAdapter.java +++ b/orgfoxttrss/src/main/java/android/support/v4/app/ClassloaderWorkaroundFragmentStatePagerAdapter.java @@ -1,39 +1,39 @@ -package android.support.v4.app; - -// http://code.google.com/p/android/issues/detail?id=37484 -// Thanks for your amazing code quality, Google. - -import android.os.Bundle; -import android.view.ViewGroup; - -public class ClassloaderWorkaroundFragmentStatePagerAdapter extends - FragmentStatePagerAdapter { - - public ClassloaderWorkaroundFragmentStatePagerAdapter(FragmentManager fm) { - super(fm); - // TODO Auto-generated constructor stub - } - - @Override - public Fragment getItem(int arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object instantiateItem(ViewGroup container, int position) { - Fragment f = (Fragment) super.instantiateItem(container, position); - Bundle savedFragmentState = f.mSavedFragmentState; - if (savedFragmentState != null) { - savedFragmentState.setClassLoader(f.getClass().getClassLoader()); - } - return f; - } - - @Override - public int getCount() { - // TODO Auto-generated method stub - return 0; - } - -} +package android.support.v4.app; + +// http://code.google.com/p/android/issues/detail?id=37484 +// Thanks for your amazing code quality, Google. + +import android.os.Bundle; +import android.view.ViewGroup; + +public class ClassloaderWorkaroundFragmentStatePagerAdapter extends + FragmentStatePagerAdapter { + + public ClassloaderWorkaroundFragmentStatePagerAdapter(FragmentManager fm) { + super(fm); + // TODO Auto-generated constructor stub + } + + @Override + public Fragment getItem(int arg0) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object instantiateItem(ViewGroup container, int position) { + Fragment f = (Fragment) super.instantiateItem(container, position); + Bundle savedFragmentState = f.mSavedFragmentState; + if (savedFragmentState != null) { + savedFragmentState.setClassLoader(f.getClass().getClassLoader()); + } + return f; + } + + @Override + public int getCount() { + // TODO Auto-generated method stub + return 0; + } + +} diff --git a/src/org/fox/ttrss/ApiRequest.java b/orgfoxttrss/src/main/java/org/fox/ttrss/ApiRequest.java similarity index 100% rename from src/org/fox/ttrss/ApiRequest.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/ApiRequest.java diff --git a/src/org/fox/ttrss/ArticleFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/ArticleFragment.java similarity index 100% rename from src/org/fox/ttrss/ArticleFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/ArticleFragment.java diff --git a/src/org/fox/ttrss/ArticlePager.java b/orgfoxttrss/src/main/java/org/fox/ttrss/ArticlePager.java similarity index 100% rename from src/org/fox/ttrss/ArticlePager.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/ArticlePager.java diff --git a/src/org/fox/ttrss/CommonActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/CommonActivity.java similarity index 100% rename from src/org/fox/ttrss/CommonActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/CommonActivity.java diff --git a/src/org/fox/ttrss/DashClock.java b/orgfoxttrss/src/main/java/org/fox/ttrss/DashClock.java similarity index 100% rename from src/org/fox/ttrss/DashClock.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/DashClock.java diff --git a/src/org/fox/ttrss/DummyFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/DummyFragment.java similarity index 100% rename from src/org/fox/ttrss/DummyFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/DummyFragment.java diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java similarity index 100% rename from src/org/fox/ttrss/FeedCategoriesFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java diff --git a/src/org/fox/ttrss/FeedsActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/FeedsActivity.java similarity index 100% rename from src/org/fox/ttrss/FeedsActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/FeedsActivity.java diff --git a/src/org/fox/ttrss/FeedsFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/FeedsFragment.java similarity index 100% rename from src/org/fox/ttrss/FeedsFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/FeedsFragment.java diff --git a/src/org/fox/ttrss/GlobalState.java b/orgfoxttrss/src/main/java/org/fox/ttrss/GlobalState.java similarity index 100% rename from src/org/fox/ttrss/GlobalState.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/GlobalState.java diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java similarity index 100% rename from src/org/fox/ttrss/HeadlinesActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java diff --git a/src/org/fox/ttrss/HeadlinesEventListener.java b/orgfoxttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java similarity index 100% rename from src/org/fox/ttrss/HeadlinesEventListener.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/HeadlinesEventListener.java diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java similarity index 100% rename from src/org/fox/ttrss/HeadlinesFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java diff --git a/src/org/fox/ttrss/LoadingFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/LoadingFragment.java similarity index 100% rename from src/org/fox/ttrss/LoadingFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/LoadingFragment.java diff --git a/src/org/fox/ttrss/OnlineActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/OnlineActivity.java similarity index 100% rename from src/org/fox/ttrss/OnlineActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/OnlineActivity.java diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java similarity index 100% rename from src/org/fox/ttrss/PreferencesActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineArticleFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java diff --git a/src/org/fox/ttrss/offline/OfflineArticlePager.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineArticlePager.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java diff --git a/src/org/fox/ttrss/offline/OfflineDownloadService.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineDownloadService.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java diff --git a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineFeedsActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineFeedsFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java diff --git a/src/org/fox/ttrss/offline/OfflineUploadService.java b/orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java similarity index 100% rename from src/org/fox/ttrss/offline/OfflineUploadService.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java diff --git a/src/org/fox/ttrss/share/CommonActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/share/CommonActivity.java similarity index 100% rename from src/org/fox/ttrss/share/CommonActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/share/CommonActivity.java diff --git a/src/org/fox/ttrss/share/CommonShareActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java similarity index 100% rename from src/org/fox/ttrss/share/CommonShareActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java diff --git a/src/org/fox/ttrss/share/ShareActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java similarity index 100% rename from src/org/fox/ttrss/share/ShareActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java diff --git a/src/org/fox/ttrss/share/SubscribeActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java similarity index 100% rename from src/org/fox/ttrss/share/SubscribeActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java diff --git a/src/org/fox/ttrss/tasker/TaskerReceiver.java b/orgfoxttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java similarity index 96% rename from src/org/fox/ttrss/tasker/TaskerReceiver.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java index 3981af7c..1b1351cb 100644 --- a/src/org/fox/ttrss/tasker/TaskerReceiver.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java @@ -1,93 +1,93 @@ -package org.fox.ttrss.tasker; - -import org.fox.ttrss.ApiRequest; -import org.fox.ttrss.CommonActivity; -import org.fox.ttrss.OnlineActivity; -import org.fox.ttrss.offline.OfflineDownloadService; -import org.fox.ttrss.offline.OfflineUploadService; -import org.fox.ttrss.util.SimpleLoginManager; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.util.Log; -import android.widget.Toast; - -public class TaskerReceiver extends BroadcastReceiver { - private final String TAG = this.getClass().getSimpleName(); - - @Override - public void onReceive(Context context, Intent intent) { - Log.d(TAG, "Got action: " + intent.getAction()); - - final Context fContext = context; - - if (com.twofortyfouram.locale.Intent.ACTION_FIRE_SETTING.equals(intent.getAction())) { - - final Bundle settings = intent.getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE); - final int actionId = settings != null ? settings.getInt("actionId", -1) : -1; - - Log.d(TAG, "received action id=" + actionId); - - SimpleLoginManager loginMgr = new SimpleLoginManager() { - - @Override - protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) { - - switch (actionId) { - case TaskerSettingsActivity.ACTION_DOWNLOAD: - if (true) { - Intent intent = new Intent(fContext, - OfflineDownloadService.class); - intent.putExtra("sessionId", sessionId); - intent.putExtra("batchMode", true); - - fContext.startService(intent); - } - break; - case TaskerSettingsActivity.ACTION_UPLOAD: - if (true) { - Intent intent = new Intent(fContext, - OfflineUploadService.class); - intent.putExtra("sessionId", sessionId); - intent.putExtra("batchMode", true); - - fContext.startService(intent); - } - break; - default: - Log.d(TAG, "unknown action id=" + actionId); - } - } - - @Override - protected void onLoginFailed(int requestId, ApiRequest ar) { - Toast toast = Toast.makeText(fContext, fContext.getString(ar.getErrorMessage()), Toast.LENGTH_SHORT); - toast.show(); - } - - @Override - protected void onLoggingIn(int requestId) { - // - } - }; - - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - - String login = prefs.getString("login", "").trim(); - String password = prefs.getString("password", "").trim(); - String ttrssUrl = prefs.getString("ttrss_url", "").trim(); - - if (ttrssUrl.equals("")) { - Toast toast = Toast.makeText(fContext, "Could not download articles: not configured?", Toast.LENGTH_SHORT); - toast.show(); - } else { - loginMgr.logIn(context, 1, login, password); - } - } - } - -} +package org.fox.ttrss.tasker; + +import org.fox.ttrss.ApiRequest; +import org.fox.ttrss.CommonActivity; +import org.fox.ttrss.OnlineActivity; +import org.fox.ttrss.offline.OfflineDownloadService; +import org.fox.ttrss.offline.OfflineUploadService; +import org.fox.ttrss.util.SimpleLoginManager; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.util.Log; +import android.widget.Toast; + +public class TaskerReceiver extends BroadcastReceiver { + private final String TAG = this.getClass().getSimpleName(); + + @Override + public void onReceive(Context context, Intent intent) { + Log.d(TAG, "Got action: " + intent.getAction()); + + final Context fContext = context; + + if (com.twofortyfouram.locale.Intent.ACTION_FIRE_SETTING.equals(intent.getAction())) { + + final Bundle settings = intent.getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE); + final int actionId = settings != null ? settings.getInt("actionId", -1) : -1; + + Log.d(TAG, "received action id=" + actionId); + + SimpleLoginManager loginMgr = new SimpleLoginManager() { + + @Override + protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) { + + switch (actionId) { + case TaskerSettingsActivity.ACTION_DOWNLOAD: + if (true) { + Intent intent = new Intent(fContext, + OfflineDownloadService.class); + intent.putExtra("sessionId", sessionId); + intent.putExtra("batchMode", true); + + fContext.startService(intent); + } + break; + case TaskerSettingsActivity.ACTION_UPLOAD: + if (true) { + Intent intent = new Intent(fContext, + OfflineUploadService.class); + intent.putExtra("sessionId", sessionId); + intent.putExtra("batchMode", true); + + fContext.startService(intent); + } + break; + default: + Log.d(TAG, "unknown action id=" + actionId); + } + } + + @Override + protected void onLoginFailed(int requestId, ApiRequest ar) { + Toast toast = Toast.makeText(fContext, fContext.getString(ar.getErrorMessage()), Toast.LENGTH_SHORT); + toast.show(); + } + + @Override + protected void onLoggingIn(int requestId) { + // + } + }; + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + + String login = prefs.getString("login", "").trim(); + String password = prefs.getString("password", "").trim(); + String ttrssUrl = prefs.getString("ttrss_url", "").trim(); + + if (ttrssUrl.equals("")) { + Toast toast = Toast.makeText(fContext, "Could not download articles: not configured?", Toast.LENGTH_SHORT); + toast.show(); + } else { + loginMgr.logIn(context, 1, login, password); + } + } + } + +} diff --git a/src/org/fox/ttrss/tasker/TaskerSettingsActivity.java b/orgfoxttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java similarity index 96% rename from src/org/fox/ttrss/tasker/TaskerSettingsActivity.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java index ff56ad1a..0770fc00 100644 --- a/src/org/fox/ttrss/tasker/TaskerSettingsActivity.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java @@ -1,96 +1,96 @@ -package org.fox.ttrss.tasker; - -import org.fox.ttrss.R; -import org.fox.ttrss.offline.OfflineDownloadService; -import org.fox.ttrss.offline.OfflineUploadService; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.RadioGroup; -import android.widget.RadioGroup.OnCheckedChangeListener; - -public class TaskerSettingsActivity extends Activity { - protected static final int ACTION_DOWNLOAD = 0; - protected static final int ACTION_UPLOAD = 1; - - private final String TAG = this.getClass().getSimpleName(); - - protected Bundle m_settings = new Bundle(); - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Bundle settings = getIntent().getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE); - - int actionId = settings != null ? settings.getInt("actionId", -1) : -1; - - setContentView(R.layout.tasker_settings); - - RadioGroup radioGroup = (RadioGroup) findViewById(R.id.taskerActions); - - switch (actionId) { - case TaskerSettingsActivity.ACTION_DOWNLOAD: - radioGroup.check(R.id.actionDownload); - break; - case TaskerSettingsActivity.ACTION_UPLOAD: - radioGroup.check(R.id.actionUpload); - break; - default: - Log.d(TAG, "unknown action id=" + actionId); - } - - radioGroup.setOnCheckedChangeListener(new OnCheckedChangeListener() { - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - switch (checkedId) { - case R.id.actionDownload: - m_settings.putInt("actionId", ACTION_DOWNLOAD); - break; - case R.id.actionUpload: - m_settings.putInt("actionId", ACTION_UPLOAD); - break; - } - } - }); - - Button button = (Button)findViewById(R.id.close_button); - - button.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void finish() { - final Intent intent = new Intent(); - - intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE, m_settings); - - String blurb = "?"; - - switch (m_settings.getInt("actionId")) { - case TaskerSettingsActivity.ACTION_DOWNLOAD: - blurb = getString(R.string.download_articles_and_go_offline); - break; - case TaskerSettingsActivity.ACTION_UPLOAD: - blurb = getString(R.string.synchronize_read_articles_and_go_online); - break; - } - - intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_STRING_BLURB, blurb); - - setResult(RESULT_OK, intent); - - super.finish(); - - } -} +package org.fox.ttrss.tasker; + +import org.fox.ttrss.R; +import org.fox.ttrss.offline.OfflineDownloadService; +import org.fox.ttrss.offline.OfflineUploadService; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.Button; +import android.widget.RadioGroup; +import android.widget.RadioGroup.OnCheckedChangeListener; + +public class TaskerSettingsActivity extends Activity { + protected static final int ACTION_DOWNLOAD = 0; + protected static final int ACTION_UPLOAD = 1; + + private final String TAG = this.getClass().getSimpleName(); + + protected Bundle m_settings = new Bundle(); + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Bundle settings = getIntent().getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE); + + int actionId = settings != null ? settings.getInt("actionId", -1) : -1; + + setContentView(R.layout.tasker_settings); + + RadioGroup radioGroup = (RadioGroup) findViewById(R.id.taskerActions); + + switch (actionId) { + case TaskerSettingsActivity.ACTION_DOWNLOAD: + radioGroup.check(R.id.actionDownload); + break; + case TaskerSettingsActivity.ACTION_UPLOAD: + radioGroup.check(R.id.actionUpload); + break; + default: + Log.d(TAG, "unknown action id=" + actionId); + } + + radioGroup.setOnCheckedChangeListener(new OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + switch (checkedId) { + case R.id.actionDownload: + m_settings.putInt("actionId", ACTION_DOWNLOAD); + break; + case R.id.actionUpload: + m_settings.putInt("actionId", ACTION_UPLOAD); + break; + } + } + }); + + Button button = (Button)findViewById(R.id.close_button); + + button.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void finish() { + final Intent intent = new Intent(); + + intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE, m_settings); + + String blurb = "?"; + + switch (m_settings.getInt("actionId")) { + case TaskerSettingsActivity.ACTION_DOWNLOAD: + blurb = getString(R.string.download_articles_and_go_offline); + break; + case TaskerSettingsActivity.ACTION_UPLOAD: + blurb = getString(R.string.synchronize_read_articles_and_go_online); + break; + } + + intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_STRING_BLURB, blurb); + + setResult(RESULT_OK, intent); + + super.finish(); + + } +} diff --git a/src/org/fox/ttrss/types/Article.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/Article.java similarity index 100% rename from src/org/fox/ttrss/types/Article.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/Article.java diff --git a/src/org/fox/ttrss/types/ArticleList.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/ArticleList.java similarity index 100% rename from src/org/fox/ttrss/types/ArticleList.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/ArticleList.java diff --git a/src/org/fox/ttrss/types/Attachment.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/Attachment.java similarity index 100% rename from src/org/fox/ttrss/types/Attachment.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/Attachment.java diff --git a/src/org/fox/ttrss/types/Feed.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/Feed.java similarity index 100% rename from src/org/fox/ttrss/types/Feed.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/Feed.java diff --git a/src/org/fox/ttrss/types/FeedCategory.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/FeedCategory.java similarity index 100% rename from src/org/fox/ttrss/types/FeedCategory.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/FeedCategory.java diff --git a/src/org/fox/ttrss/types/FeedCategoryList.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/FeedCategoryList.java similarity index 100% rename from src/org/fox/ttrss/types/FeedCategoryList.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/FeedCategoryList.java diff --git a/src/org/fox/ttrss/types/FeedList.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/FeedList.java similarity index 100% rename from src/org/fox/ttrss/types/FeedList.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/FeedList.java diff --git a/src/org/fox/ttrss/types/Label.java b/orgfoxttrss/src/main/java/org/fox/ttrss/types/Label.java similarity index 100% rename from src/org/fox/ttrss/types/Label.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/types/Label.java diff --git a/src/org/fox/ttrss/util/AppRater.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/AppRater.java similarity index 100% rename from src/org/fox/ttrss/util/AppRater.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/AppRater.java diff --git a/src/org/fox/ttrss/util/DatabaseHelper.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/DatabaseHelper.java similarity index 100% rename from src/org/fox/ttrss/util/DatabaseHelper.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/DatabaseHelper.java diff --git a/src/org/fox/ttrss/util/EnlargingImageView.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java similarity index 96% rename from src/org/fox/ttrss/util/EnlargingImageView.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java index b6f9bce9..e3f1e6f6 100644 --- a/src/org/fox/ttrss/util/EnlargingImageView.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java @@ -1,252 +1,252 @@ -package org.fox.ttrss.util; - -/* - * Copyright (C) 2013 Tomáš Procházka - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.lang.reflect.Field; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; - -/** - * Special version of ImageView which allow enlarge width of image if android:adjustViewBounds is true. - * - *

It simulate HTML behaviour <img src="" widh="100" />

- *

Stackoverflow question link

- * - *

It also allow set related view which will be used as reference for size measure.

- * - * @author Tomáš Procházka <tomas.prochazka@gmail.com> - * @version $Revision: 0$ ($Date: 6.6.2011 18:16:52$) - */ -public class EnlargingImageView extends android.widget.ImageView { - - private int mDrawableWidth; - private int mDrawableHeight; - private boolean mAdjustViewBoundsL; - private int mMaxWidthL = Integer.MAX_VALUE; - private int mMaxHeightL = Integer.MAX_VALUE; - private View relatedView; - - public EnlargingImageView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - // hack for acces some private field of parent :-( - Field f; - try { - f = android.widget.ImageView.class.getDeclaredField("mAdjustViewBounds"); - f.setAccessible(true); - setAdjustViewBounds((Boolean) f.get(this)); - - f = android.widget.ImageView.class.getDeclaredField("mMaxWidth"); - f.setAccessible(true); - setMaxWidth((Integer) f.get(this)); - - f = android.widget.ImageView.class.getDeclaredField("mMaxHeight"); - f.setAccessible(true); - setMaxHeight((Integer) f.get(this)); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public EnlargingImageView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public EnlargingImageView(Context context) { - super(context); - } - - public void setAdjustViewBounds(boolean adjustViewBounds) { - super.setAdjustViewBounds(adjustViewBounds); - mAdjustViewBoundsL = adjustViewBounds; - } - - public void setMaxWidth(int maxWidth) { - super.setMaxWidth(maxWidth); - mMaxWidthL = maxWidth; - } - - public void setMaxHeight(int maxHeight) { - super.setMaxHeight(maxHeight); - mMaxHeightL = maxHeight; - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - - if (getDrawable() == null) { - setMeasuredDimension(0, 0); - return; - } - - mDrawableWidth = getDrawable().getIntrinsicWidth(); - mDrawableHeight = getDrawable().getIntrinsicHeight(); - - int w = 0; - int h = 0; - - // Desired aspect ratio of the view's contents (not including padding) - float desiredAspect = 0.0f; - - // We are allowed to change the view's width - boolean resizeWidth = false; - - // We are allowed to change the view's height - boolean resizeHeight = false; - - if (mDrawableWidth > 0) { - w = mDrawableWidth; - h = mDrawableHeight; - if (w <= 0) w = 1; - if (h <= 0) h = 1; - - // We are supposed to adjust view bounds to match the aspect - // ratio of our drawable. See if that is possible. - if (mAdjustViewBoundsL) { - - int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec); - int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec); - - resizeWidth = widthSpecMode != MeasureSpec.EXACTLY; - resizeHeight = heightSpecMode != MeasureSpec.EXACTLY; - - desiredAspect = (float) w / (float) h; - } - } - - int pleft = getPaddingLeft(); - int pright = getPaddingRight(); - int ptop = getPaddingTop(); - int pbottom = getPaddingBottom(); - - int widthSize; - int heightSize; - - if (resizeWidth || resizeHeight) { - /* If we get here, it means we want to resize to match the - drawables aspect ratio, and we have the freedom to change at - least one dimension. - */ - - // Get the max possible width given our constraints - widthSize = resolveAdjustedSize(w + pleft + pright, - mMaxWidthL, widthMeasureSpec); - - // Get the max possible height given our constraints - heightSize = resolveAdjustedSize(h + ptop + pbottom, - mMaxHeightL, heightMeasureSpec); - - if (desiredAspect != 0.0f) { - // See what our actual aspect ratio is - float actualAspect = (float) (widthSize - pleft - pright) / - (heightSize - ptop - pbottom); - - if (Math.abs(actualAspect - desiredAspect) > 0.0000001) { - - // Try adjusting width to be proportional to height - if (resizeWidth) { - int newWidth = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; - if (/*newWidth <= widthSize &&*/newWidth > 0) { - widthSize = Math.min(newWidth, mMaxWidthL); - heightSize = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; - } - } - - // Try adjusting height to be proportional to width - if (resizeHeight) { - int newHeight = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; - if (/*newHeight <= heightSize && */newHeight > 0) { - heightSize = Math.min(newHeight, mMaxHeightL); - widthSize = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; - } - } - } - } - } else { - /* We are either don't want to preserve the drawables aspect ratio, - or we are not allowed to change view dimensions. Just measure in - the normal way. - */ - w += pleft + pright; - h += ptop + pbottom; - - w = Math.max(w, getSuggestedMinimumWidth()); - h = Math.max(h, getSuggestedMinimumHeight()); - - widthSize = resolveSize(w, widthMeasureSpec); - heightSize = resolveSize(h, heightMeasureSpec); - } - - //Log.d(Constants.LOGTAG, mDrawableWidth + ":" + mDrawableHeight + " to " + widthSize + ":" + heightSize); - - setMeasuredDimension(widthSize, heightSize); - - if (relatedView != null) { - //Log.i(Constants.LOGTAG, getTag() + " onMeasure:" + widthSize + ", " + heightSize + " update size of related view!"); - relatedView.getLayoutParams().width = widthSize; - relatedView.getLayoutParams().height = heightSize; - } - - } - - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - super.onLayout(changed, left, top, right, bottom); - //Log.d(Constants.LOGTAG, getTag() + " onLayout:" + left + ", " + top + ", " + right + ", " + bottom); - } - - /** - * Experimental. This view will be set to the same size as this image. - */ - public void setRelatedView(View view) { - relatedView = view; - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - //Log.d(Constants.LOGTAG, getTag() + " onSizeChanged:" + w + ", " + h + ", " + oldw + ", " + oldh); - } - - private int resolveAdjustedSize(int desiredSize, int maxSize, int measureSpec) { - int result = desiredSize; - int specMode = MeasureSpec.getMode(measureSpec); - int specSize = MeasureSpec.getSize(measureSpec); - switch (specMode) { - case MeasureSpec.UNSPECIFIED: - /* Parent says we can be as big as we want. Just don't be larger - than max size imposed on ourselves. - */ - result = Math.min(desiredSize, maxSize); - break; - case MeasureSpec.AT_MOST: - // Parent says we can be as big as we want, up to specSize. - // Don't be larger than specSize, and don't be larger than - // the max size imposed on ourselves. - result = Math.min(Math.min(desiredSize, specSize), maxSize); - break; - case MeasureSpec.EXACTLY: - // No choice. Do what we are told. - result = specSize; - break; - } - return result; - } +package org.fox.ttrss.util; + +/* + * Copyright (C) 2013 Tomáš Procházka + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.lang.reflect.Field; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; + +/** + * Special version of ImageView which allow enlarge width of image if android:adjustViewBounds is true. + * + *

It simulate HTML behaviour <img src="" widh="100" />

+ *

Stackoverflow question link

+ * + *

It also allow set related view which will be used as reference for size measure.

+ * + * @author Tomáš Procházka <tomas.prochazka@gmail.com> + * @version $Revision: 0$ ($Date: 6.6.2011 18:16:52$) + */ +public class EnlargingImageView extends android.widget.ImageView { + + private int mDrawableWidth; + private int mDrawableHeight; + private boolean mAdjustViewBoundsL; + private int mMaxWidthL = Integer.MAX_VALUE; + private int mMaxHeightL = Integer.MAX_VALUE; + private View relatedView; + + public EnlargingImageView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + + // hack for acces some private field of parent :-( + Field f; + try { + f = android.widget.ImageView.class.getDeclaredField("mAdjustViewBounds"); + f.setAccessible(true); + setAdjustViewBounds((Boolean) f.get(this)); + + f = android.widget.ImageView.class.getDeclaredField("mMaxWidth"); + f.setAccessible(true); + setMaxWidth((Integer) f.get(this)); + + f = android.widget.ImageView.class.getDeclaredField("mMaxHeight"); + f.setAccessible(true); + setMaxHeight((Integer) f.get(this)); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public EnlargingImageView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public EnlargingImageView(Context context) { + super(context); + } + + public void setAdjustViewBounds(boolean adjustViewBounds) { + super.setAdjustViewBounds(adjustViewBounds); + mAdjustViewBoundsL = adjustViewBounds; + } + + public void setMaxWidth(int maxWidth) { + super.setMaxWidth(maxWidth); + mMaxWidthL = maxWidth; + } + + public void setMaxHeight(int maxHeight) { + super.setMaxHeight(maxHeight); + mMaxHeightL = maxHeight; + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + + if (getDrawable() == null) { + setMeasuredDimension(0, 0); + return; + } + + mDrawableWidth = getDrawable().getIntrinsicWidth(); + mDrawableHeight = getDrawable().getIntrinsicHeight(); + + int w = 0; + int h = 0; + + // Desired aspect ratio of the view's contents (not including padding) + float desiredAspect = 0.0f; + + // We are allowed to change the view's width + boolean resizeWidth = false; + + // We are allowed to change the view's height + boolean resizeHeight = false; + + if (mDrawableWidth > 0) { + w = mDrawableWidth; + h = mDrawableHeight; + if (w <= 0) w = 1; + if (h <= 0) h = 1; + + // We are supposed to adjust view bounds to match the aspect + // ratio of our drawable. See if that is possible. + if (mAdjustViewBoundsL) { + + int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec); + int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec); + + resizeWidth = widthSpecMode != MeasureSpec.EXACTLY; + resizeHeight = heightSpecMode != MeasureSpec.EXACTLY; + + desiredAspect = (float) w / (float) h; + } + } + + int pleft = getPaddingLeft(); + int pright = getPaddingRight(); + int ptop = getPaddingTop(); + int pbottom = getPaddingBottom(); + + int widthSize; + int heightSize; + + if (resizeWidth || resizeHeight) { + /* If we get here, it means we want to resize to match the + drawables aspect ratio, and we have the freedom to change at + least one dimension. + */ + + // Get the max possible width given our constraints + widthSize = resolveAdjustedSize(w + pleft + pright, + mMaxWidthL, widthMeasureSpec); + + // Get the max possible height given our constraints + heightSize = resolveAdjustedSize(h + ptop + pbottom, + mMaxHeightL, heightMeasureSpec); + + if (desiredAspect != 0.0f) { + // See what our actual aspect ratio is + float actualAspect = (float) (widthSize - pleft - pright) / + (heightSize - ptop - pbottom); + + if (Math.abs(actualAspect - desiredAspect) > 0.0000001) { + + // Try adjusting width to be proportional to height + if (resizeWidth) { + int newWidth = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; + if (/*newWidth <= widthSize &&*/newWidth > 0) { + widthSize = Math.min(newWidth, mMaxWidthL); + heightSize = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; + } + } + + // Try adjusting height to be proportional to width + if (resizeHeight) { + int newHeight = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; + if (/*newHeight <= heightSize && */newHeight > 0) { + heightSize = Math.min(newHeight, mMaxHeightL); + widthSize = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; + } + } + } + } + } else { + /* We are either don't want to preserve the drawables aspect ratio, + or we are not allowed to change view dimensions. Just measure in + the normal way. + */ + w += pleft + pright; + h += ptop + pbottom; + + w = Math.max(w, getSuggestedMinimumWidth()); + h = Math.max(h, getSuggestedMinimumHeight()); + + widthSize = resolveSize(w, widthMeasureSpec); + heightSize = resolveSize(h, heightMeasureSpec); + } + + //Log.d(Constants.LOGTAG, mDrawableWidth + ":" + mDrawableHeight + " to " + widthSize + ":" + heightSize); + + setMeasuredDimension(widthSize, heightSize); + + if (relatedView != null) { + //Log.i(Constants.LOGTAG, getTag() + " onMeasure:" + widthSize + ", " + heightSize + " update size of related view!"); + relatedView.getLayoutParams().width = widthSize; + relatedView.getLayoutParams().height = heightSize; + } + + } + + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + //Log.d(Constants.LOGTAG, getTag() + " onLayout:" + left + ", " + top + ", " + right + ", " + bottom); + } + + /** + * Experimental. This view will be set to the same size as this image. + */ + public void setRelatedView(View view) { + relatedView = view; + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + //Log.d(Constants.LOGTAG, getTag() + " onSizeChanged:" + w + ", " + h + ", " + oldw + ", " + oldh); + } + + private int resolveAdjustedSize(int desiredSize, int maxSize, int measureSpec) { + int result = desiredSize; + int specMode = MeasureSpec.getMode(measureSpec); + int specSize = MeasureSpec.getSize(measureSpec); + switch (specMode) { + case MeasureSpec.UNSPECIFIED: + /* Parent says we can be as big as we want. Just don't be larger + than max size imposed on ourselves. + */ + result = Math.min(desiredSize, maxSize); + break; + case MeasureSpec.AT_MOST: + // Parent says we can be as big as we want, up to specSize. + // Don't be larger than specSize, and don't be larger than + // the max size imposed on ourselves. + result = Math.min(Math.min(desiredSize, specSize), maxSize); + break; + case MeasureSpec.EXACTLY: + // No choice. Do what we are told. + result = specSize; + break; + } + return result; + } } \ No newline at end of file diff --git a/src/org/fox/ttrss/util/FontSizeDialogPreference.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java similarity index 96% rename from src/org/fox/ttrss/util/FontSizeDialogPreference.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java index a4220fd1..ec7af2e5 100644 --- a/src/org/fox/ttrss/util/FontSizeDialogPreference.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java @@ -1,224 +1,224 @@ -package org.fox.ttrss.util; - -// http://www.lukehorvat.com/blog/android-seekbardialogpreference/ - -import org.fox.ttrss.R; - -import android.content.Context; -import android.content.res.TypedArray; -import android.os.Parcel; -import android.os.Parcelable; -import android.preference.DialogPreference; -import android.util.AttributeSet; -import android.util.TypedValue; -import android.view.View; -import android.widget.SeekBar; -import android.widget.SeekBar.OnSeekBarChangeListener; -import android.widget.TextView; - -/** - * A {@link DialogPreference} that provides a user with the means to select an - * integer from a {@link SeekBar}, and persist it. - * - * @author lukehorvat - * - */ -public class FontSizeDialogPreference extends DialogPreference { - private static final int DEFAULT_MIN_PROGRESS = 9; - private static final int DEFAULT_MAX_PROGRESS = 24; - private static final String DEFAULT_PROGRESS = "0"; - - private int mMinProgress = DEFAULT_MIN_PROGRESS; - private int mMaxProgress = DEFAULT_MAX_PROGRESS; - private int mProgress; - private CharSequence mProgressTextSuffix; - private TextView mProgressText; - private SeekBar mSeekBar; - - public FontSizeDialogPreference(Context context) { - this(context, null); - } - - public FontSizeDialogPreference(Context context, AttributeSet attrs) { - super(context, attrs); - - setProgressTextSuffix(" " + context.getString(R.string.font_size_dialog_suffix)); - - // set layout - setDialogLayoutResource(R.layout.select_font_size_dialog); - setPositiveButtonText(android.R.string.ok); - setNegativeButtonText(android.R.string.cancel); - setDialogIcon(null); - } - - @Override - protected void onSetInitialValue(boolean restore, Object defaultValue) { - setProgress(restore ? Integer.valueOf(getPersistedString(DEFAULT_PROGRESS)) - : Integer.valueOf((String)defaultValue)); - } - - @Override - protected Object onGetDefaultValue(TypedArray a, int index) { - return a.getString(index); - } - - @Override - protected void onBindDialogView(View view) { - super.onBindDialogView(view); - - mProgressText = (TextView) view.findViewById(R.id.text_progress); - - mSeekBar = (SeekBar) view.findViewById(R.id.seek_bar); - mSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() { - @Override - public void onStopTrackingTouch(SeekBar seekBar) { - } - - @Override - public void onStartTrackingTouch(SeekBar seekBar) { - } - - @Override - public void onProgressChanged(SeekBar seekBar, int progress, - boolean fromUser) { - // update text that displays the current SeekBar progress value - // note: this does not persist the progress value. that is only - // ever done in setProgress() - String progressStr = String.valueOf(progress + mMinProgress); - mProgressText.setText(mProgressTextSuffix == null ? progressStr - : progressStr.concat(mProgressTextSuffix.toString())); - mProgressText.setTextSize(TypedValue.COMPLEX_UNIT_SP, progress + mMinProgress); - } - }); - - mSeekBar.setMax(mMaxProgress - mMinProgress); - mSeekBar.setProgress(mProgress - mMinProgress); - } - - public int getMinProgress() { - return mMinProgress; - } - - public void setMinProgress(int minProgress) { - mMinProgress = minProgress; - setProgress(Math.max(mProgress, mMinProgress)); - } - - public int getMaxProgress() { - return mMaxProgress; - } - - public void setMaxProgress(int maxProgress) { - mMaxProgress = maxProgress; - setProgress(Math.min(mProgress, mMaxProgress)); - } - - public int getProgress() { - return mProgress; - } - - public void setProgress(int progress) { - progress = Math.max(Math.min(progress, mMaxProgress), mMinProgress); - - if (progress != mProgress) { - mProgress = progress; - persistString(String.valueOf(progress)); - notifyChanged(); - } - } - - public CharSequence getProgressTextSuffix() { - return mProgressTextSuffix; - } - - public void setProgressTextSuffix(CharSequence progressTextSuffix) { - mProgressTextSuffix = progressTextSuffix; - } - - @Override - protected void onDialogClosed(boolean positiveResult) { - super.onDialogClosed(positiveResult); - - // when the user selects "OK", persist the new value - if (positiveResult) { - int seekBarProgress = mSeekBar.getProgress() + mMinProgress; - if (callChangeListener(seekBarProgress)) { - setProgress(seekBarProgress); - } - } - } - - @Override - protected Parcelable onSaveInstanceState() { - // save the instance state so that it will survive screen orientation - // changes and other events that may temporarily destroy it - final Parcelable superState = super.onSaveInstanceState(); - - // set the state's value with the class member that holds current - // setting value - final SavedState myState = new SavedState(superState); - myState.minProgress = getMinProgress(); - myState.maxProgress = getMaxProgress(); - myState.progress = getProgress(); - - return myState; - } - - @Override - protected void onRestoreInstanceState(Parcelable state) { - // check whether we saved the state in onSaveInstanceState() - if (state == null || !state.getClass().equals(SavedState.class)) { - // didn't save the state, so call superclass - super.onRestoreInstanceState(state); - return; - } - - // restore the state - SavedState myState = (SavedState) state; - setMinProgress(myState.minProgress); - setMaxProgress(myState.maxProgress); - setProgress(myState.progress); - - super.onRestoreInstanceState(myState.getSuperState()); - } - - private static class SavedState extends BaseSavedState { - int minProgress; - int maxProgress; - int progress; - - public SavedState(Parcelable superState) { - super(superState); - } - - public SavedState(Parcel source) { - super(source); - - minProgress = source.readInt(); - maxProgress = source.readInt(); - progress = source.readInt(); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - super.writeToParcel(dest, flags); - - dest.writeInt(minProgress); - dest.writeInt(maxProgress); - dest.writeInt(progress); - } - - @SuppressWarnings("unused") - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - @Override - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; - } +package org.fox.ttrss.util; + +// http://www.lukehorvat.com/blog/android-seekbardialogpreference/ + +import org.fox.ttrss.R; + +import android.content.Context; +import android.content.res.TypedArray; +import android.os.Parcel; +import android.os.Parcelable; +import android.preference.DialogPreference; +import android.util.AttributeSet; +import android.util.TypedValue; +import android.view.View; +import android.widget.SeekBar; +import android.widget.SeekBar.OnSeekBarChangeListener; +import android.widget.TextView; + +/** + * A {@link DialogPreference} that provides a user with the means to select an + * integer from a {@link SeekBar}, and persist it. + * + * @author lukehorvat + * + */ +public class FontSizeDialogPreference extends DialogPreference { + private static final int DEFAULT_MIN_PROGRESS = 9; + private static final int DEFAULT_MAX_PROGRESS = 24; + private static final String DEFAULT_PROGRESS = "0"; + + private int mMinProgress = DEFAULT_MIN_PROGRESS; + private int mMaxProgress = DEFAULT_MAX_PROGRESS; + private int mProgress; + private CharSequence mProgressTextSuffix; + private TextView mProgressText; + private SeekBar mSeekBar; + + public FontSizeDialogPreference(Context context) { + this(context, null); + } + + public FontSizeDialogPreference(Context context, AttributeSet attrs) { + super(context, attrs); + + setProgressTextSuffix(" " + context.getString(R.string.font_size_dialog_suffix)); + + // set layout + setDialogLayoutResource(R.layout.select_font_size_dialog); + setPositiveButtonText(android.R.string.ok); + setNegativeButtonText(android.R.string.cancel); + setDialogIcon(null); + } + + @Override + protected void onSetInitialValue(boolean restore, Object defaultValue) { + setProgress(restore ? Integer.valueOf(getPersistedString(DEFAULT_PROGRESS)) + : Integer.valueOf((String)defaultValue)); + } + + @Override + protected Object onGetDefaultValue(TypedArray a, int index) { + return a.getString(index); + } + + @Override + protected void onBindDialogView(View view) { + super.onBindDialogView(view); + + mProgressText = (TextView) view.findViewById(R.id.text_progress); + + mSeekBar = (SeekBar) view.findViewById(R.id.seek_bar); + mSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() { + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) { + } + + @Override + public void onProgressChanged(SeekBar seekBar, int progress, + boolean fromUser) { + // update text that displays the current SeekBar progress value + // note: this does not persist the progress value. that is only + // ever done in setProgress() + String progressStr = String.valueOf(progress + mMinProgress); + mProgressText.setText(mProgressTextSuffix == null ? progressStr + : progressStr.concat(mProgressTextSuffix.toString())); + mProgressText.setTextSize(TypedValue.COMPLEX_UNIT_SP, progress + mMinProgress); + } + }); + + mSeekBar.setMax(mMaxProgress - mMinProgress); + mSeekBar.setProgress(mProgress - mMinProgress); + } + + public int getMinProgress() { + return mMinProgress; + } + + public void setMinProgress(int minProgress) { + mMinProgress = minProgress; + setProgress(Math.max(mProgress, mMinProgress)); + } + + public int getMaxProgress() { + return mMaxProgress; + } + + public void setMaxProgress(int maxProgress) { + mMaxProgress = maxProgress; + setProgress(Math.min(mProgress, mMaxProgress)); + } + + public int getProgress() { + return mProgress; + } + + public void setProgress(int progress) { + progress = Math.max(Math.min(progress, mMaxProgress), mMinProgress); + + if (progress != mProgress) { + mProgress = progress; + persistString(String.valueOf(progress)); + notifyChanged(); + } + } + + public CharSequence getProgressTextSuffix() { + return mProgressTextSuffix; + } + + public void setProgressTextSuffix(CharSequence progressTextSuffix) { + mProgressTextSuffix = progressTextSuffix; + } + + @Override + protected void onDialogClosed(boolean positiveResult) { + super.onDialogClosed(positiveResult); + + // when the user selects "OK", persist the new value + if (positiveResult) { + int seekBarProgress = mSeekBar.getProgress() + mMinProgress; + if (callChangeListener(seekBarProgress)) { + setProgress(seekBarProgress); + } + } + } + + @Override + protected Parcelable onSaveInstanceState() { + // save the instance state so that it will survive screen orientation + // changes and other events that may temporarily destroy it + final Parcelable superState = super.onSaveInstanceState(); + + // set the state's value with the class member that holds current + // setting value + final SavedState myState = new SavedState(superState); + myState.minProgress = getMinProgress(); + myState.maxProgress = getMaxProgress(); + myState.progress = getProgress(); + + return myState; + } + + @Override + protected void onRestoreInstanceState(Parcelable state) { + // check whether we saved the state in onSaveInstanceState() + if (state == null || !state.getClass().equals(SavedState.class)) { + // didn't save the state, so call superclass + super.onRestoreInstanceState(state); + return; + } + + // restore the state + SavedState myState = (SavedState) state; + setMinProgress(myState.minProgress); + setMaxProgress(myState.maxProgress); + setProgress(myState.progress); + + super.onRestoreInstanceState(myState.getSuperState()); + } + + private static class SavedState extends BaseSavedState { + int minProgress; + int maxProgress; + int progress; + + public SavedState(Parcelable superState) { + super(superState); + } + + public SavedState(Parcel source) { + super(source); + + minProgress = source.readInt(); + maxProgress = source.readInt(); + progress = source.readInt(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + super.writeToParcel(dest, flags); + + dest.writeInt(minProgress); + dest.writeInt(maxProgress); + dest.writeInt(progress); + } + + @SuppressWarnings("unused") + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + @Override + public SavedState createFromParcel(Parcel in) { + return new SavedState(in); + } + + @Override + public SavedState[] newArray(int size) { + return new SavedState[size]; + } + }; + } } \ No newline at end of file diff --git a/src/org/fox/ttrss/util/HeadlinesRequest.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java similarity index 100% rename from src/org/fox/ttrss/util/HeadlinesRequest.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java diff --git a/src/org/fox/ttrss/util/ImageCacheService.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java similarity index 100% rename from src/org/fox/ttrss/util/ImageCacheService.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java diff --git a/src/org/fox/ttrss/util/LessBrokenWebView.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/LessBrokenWebView.java similarity index 96% rename from src/org/fox/ttrss/util/LessBrokenWebView.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/LessBrokenWebView.java index c6cab513..4a3ea826 100644 --- a/src/org/fox/ttrss/util/LessBrokenWebView.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/util/LessBrokenWebView.java @@ -1,37 +1,37 @@ -package org.fox.ttrss.util; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.webkit.WebView; - -public class LessBrokenWebView extends WebView { - - public LessBrokenWebView(Context context) { - super(context); - // TODO Auto-generated constructor stub - } - - public LessBrokenWebView(Context context, AttributeSet attrs) { - super(context, attrs); - // TODO Auto-generated constructor stub - } - - public LessBrokenWebView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - // TODO Auto-generated constructor stub - } - - @Override - public boolean onTouchEvent(MotionEvent event) { - - if (event.getAction() == MotionEvent.ACTION_DOWN) { - int temp_ScrollY = getScrollY(); - scrollTo(getScrollX(), getScrollY() + 1); - scrollTo(getScrollX(), temp_ScrollY); - } - - return super.onTouchEvent(event); - } - -} +package org.fox.ttrss.util; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.webkit.WebView; + +public class LessBrokenWebView extends WebView { + + public LessBrokenWebView(Context context) { + super(context); + // TODO Auto-generated constructor stub + } + + public LessBrokenWebView(Context context, AttributeSet attrs) { + super(context, attrs); + // TODO Auto-generated constructor stub + } + + public LessBrokenWebView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + // TODO Auto-generated constructor stub + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + + if (event.getAction() == MotionEvent.ACTION_DOWN) { + int temp_ScrollY = getScrollY(); + scrollTo(getScrollX(), getScrollY() + 1); + scrollTo(getScrollX(), temp_ScrollY); + } + + return super.onTouchEvent(event); + } + +} diff --git a/src/org/fox/ttrss/util/NoChildFocusScrollView.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/NoChildFocusScrollView.java similarity index 96% rename from src/org/fox/ttrss/util/NoChildFocusScrollView.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/NoChildFocusScrollView.java index 3dea82a4..b5ec23c5 100644 --- a/src/org/fox/ttrss/util/NoChildFocusScrollView.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/util/NoChildFocusScrollView.java @@ -1,34 +1,34 @@ -package org.fox.ttrss.util; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.webkit.WebView; -import android.widget.ScrollView; - -public class NoChildFocusScrollView extends ScrollView { - - public NoChildFocusScrollView(Context context) { - super(context); - // TODO Auto-generated constructor stub - } - - - public NoChildFocusScrollView(Context context, AttributeSet attrs) { - super(context, attrs); - // TODO Auto-generated constructor stub - } - - public NoChildFocusScrollView(Context context, AttributeSet attrs, - int defStyle) { - super(context, attrs, defStyle); - // TODO Auto-generated constructor stub - } - - @Override - public void requestChildFocus(View child, View focused) { - if (focused instanceof WebView ) - return; - super.requestChildFocus(child, focused); - } -} +package org.fox.ttrss.util; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.webkit.WebView; +import android.widget.ScrollView; + +public class NoChildFocusScrollView extends ScrollView { + + public NoChildFocusScrollView(Context context) { + super(context); + // TODO Auto-generated constructor stub + } + + + public NoChildFocusScrollView(Context context, AttributeSet attrs) { + super(context, attrs); + // TODO Auto-generated constructor stub + } + + public NoChildFocusScrollView(Context context, AttributeSet attrs, + int defStyle) { + super(context, attrs, defStyle); + // TODO Auto-generated constructor stub + } + + @Override + public void requestChildFocus(View child, View focused) { + if (focused instanceof WebView ) + return; + super.requestChildFocus(child, focused); + } +} diff --git a/src/org/fox/ttrss/util/PrefsBackupAgent.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/PrefsBackupAgent.java similarity index 100% rename from src/org/fox/ttrss/util/PrefsBackupAgent.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/PrefsBackupAgent.java diff --git a/src/org/fox/ttrss/util/SimpleLoginManager.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java similarity index 95% rename from src/org/fox/ttrss/util/SimpleLoginManager.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java index 072c0062..e11e574d 100644 --- a/src/org/fox/ttrss/util/SimpleLoginManager.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java @@ -1,105 +1,105 @@ -package org.fox.ttrss.util; - -import java.util.HashMap; - -import org.fox.ttrss.ApiRequest; - -import android.content.Context; -import android.util.Log; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -public abstract class SimpleLoginManager { - private final String TAG = this.getClass().getSimpleName(); - - protected class LoginRequest extends ApiRequest { - private int m_requestId; - protected String m_sessionId; - protected int m_apiLevel; - protected Context m_context; - - public LoginRequest(Context context, int requestId) { - super(context); - m_context = context; - m_requestId = requestId; - } - - protected void onPostExecute(JsonElement result) { - Log.d(TAG, "onPostExecute"); - - if (result != null) { - try { - JsonObject content = result.getAsJsonObject(); - if (content != null) { - m_sessionId = content.get("session_id").getAsString(); - - Log.d(TAG, "[SLM] Authenticated!"); - - ApiRequest req = new ApiRequest(m_context) { - protected void onPostExecute(JsonElement result) { - m_apiLevel = 0; - - if (result != null) { - try { - m_apiLevel = result.getAsJsonObject() - .get("level").getAsInt(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - Log.d(TAG, "[SLM] Received API level: " + m_apiLevel); - - onLoginSuccess(m_requestId, m_sessionId, m_apiLevel); - } - }; - - @SuppressWarnings("serial") - HashMap map = new HashMap() { - { - put("sid", m_sessionId); - put("op", "getApiLevel"); - } - }; - - req.execute(map); - - return; - } - - } catch (Exception e) { - e.printStackTrace(); - } - } - - m_sessionId = null; - - onLoginFailed(m_requestId, this); - } - - } - - public void logIn(Context context, int requestId, final String login, final String password) { - LoginRequest ar = new LoginRequest(context, requestId); - - HashMap map = new HashMap() { - { - put("op", "login"); - put("user", login.trim()); - put("password", password.trim()); - } - }; - - onLoggingIn(requestId); - - ar.execute(map); - } - - protected abstract void onLoggingIn(int requestId); - - protected abstract void onLoginSuccess(int requestId, String sessionId, int apiLevel); - - protected abstract void onLoginFailed(int requestId, ApiRequest ar); - -} +package org.fox.ttrss.util; + +import java.util.HashMap; + +import org.fox.ttrss.ApiRequest; + +import android.content.Context; +import android.util.Log; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +public abstract class SimpleLoginManager { + private final String TAG = this.getClass().getSimpleName(); + + protected class LoginRequest extends ApiRequest { + private int m_requestId; + protected String m_sessionId; + protected int m_apiLevel; + protected Context m_context; + + public LoginRequest(Context context, int requestId) { + super(context); + m_context = context; + m_requestId = requestId; + } + + protected void onPostExecute(JsonElement result) { + Log.d(TAG, "onPostExecute"); + + if (result != null) { + try { + JsonObject content = result.getAsJsonObject(); + if (content != null) { + m_sessionId = content.get("session_id").getAsString(); + + Log.d(TAG, "[SLM] Authenticated!"); + + ApiRequest req = new ApiRequest(m_context) { + protected void onPostExecute(JsonElement result) { + m_apiLevel = 0; + + if (result != null) { + try { + m_apiLevel = result.getAsJsonObject() + .get("level").getAsInt(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + Log.d(TAG, "[SLM] Received API level: " + m_apiLevel); + + onLoginSuccess(m_requestId, m_sessionId, m_apiLevel); + } + }; + + @SuppressWarnings("serial") + HashMap map = new HashMap() { + { + put("sid", m_sessionId); + put("op", "getApiLevel"); + } + }; + + req.execute(map); + + return; + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + + m_sessionId = null; + + onLoginFailed(m_requestId, this); + } + + } + + public void logIn(Context context, int requestId, final String login, final String password) { + LoginRequest ar = new LoginRequest(context, requestId); + + HashMap map = new HashMap() { + { + put("op", "login"); + put("user", login.trim()); + put("password", password.trim()); + } + }; + + onLoggingIn(requestId); + + ar.execute(map); + } + + protected abstract void onLoggingIn(int requestId); + + protected abstract void onLoginSuccess(int requestId, String sessionId, int apiLevel); + + protected abstract void onLoginFailed(int requestId, ApiRequest ar); + +} diff --git a/src/org/fox/ttrss/util/TitleWebView.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/TitleWebView.java similarity index 100% rename from src/org/fox/ttrss/util/TitleWebView.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/TitleWebView.java diff --git a/src/org/fox/ttrss/util/TypefaceCache.java b/orgfoxttrss/src/main/java/org/fox/ttrss/util/TypefaceCache.java similarity index 96% rename from src/org/fox/ttrss/util/TypefaceCache.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/util/TypefaceCache.java index 150d3d83..752304ca 100644 --- a/src/org/fox/ttrss/util/TypefaceCache.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/util/TypefaceCache.java @@ -1,29 +1,29 @@ -package org.fox.ttrss.util; - -import java.util.Hashtable; - -import android.content.Context; -import android.graphics.Typeface; -import android.util.Log; - -public class TypefaceCache { - private static final String TAG = "TypefaceCache"; - private static final Hashtable cache = new Hashtable(); - - public static Typeface get(Context c, String typefaceName, int style) { - synchronized (cache) { - String key = typefaceName + ":" + style; - - if (!cache.containsKey(key)) { - try { - Typeface t = Typeface.create(typefaceName, style); - cache.put(key, t); - } catch (Exception e) { - Log.e(TAG, "Could not get typeface '" + typefaceName + "' because " + e.getMessage()); - return null; - } - } - return cache.get(key); - } - } +package org.fox.ttrss.util; + +import java.util.Hashtable; + +import android.content.Context; +import android.graphics.Typeface; +import android.util.Log; + +public class TypefaceCache { + private static final String TAG = "TypefaceCache"; + private static final Hashtable cache = new Hashtable(); + + public static Typeface get(Context c, String typefaceName, int style) { + synchronized (cache) { + String key = typefaceName + ":" + style; + + if (!cache.containsKey(key)) { + try { + Typeface t = Typeface.create(typefaceName, style); + cache.put(key, t); + } catch (Exception e) { + Log.e(TAG, "Could not get typeface '" + typefaceName + "' because " + e.getMessage()); + return null; + } + } + return cache.get(key); + } + } } \ No newline at end of file diff --git a/src/org/fox/ttrss/widget/SmallWidgetProvider.java b/orgfoxttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java similarity index 97% rename from src/org/fox/ttrss/widget/SmallWidgetProvider.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java index dbbe718c..6162abab 100644 --- a/src/org/fox/ttrss/widget/SmallWidgetProvider.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java @@ -1,65 +1,65 @@ -package org.fox.ttrss.widget; - -import org.fox.ttrss.R; - -import android.app.PendingIntent; -import android.app.PendingIntent.CanceledException; -import android.app.Service; -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProvider; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.util.Log; -import android.widget.RemoteViews; - -public class SmallWidgetProvider extends AppWidgetProvider { - private final String TAG = this.getClass().getSimpleName(); - - public static final String FORCE_UPDATE_ACTION = "org.fox.ttrss.WIDGET_FORCE_UPDATE"; - - @Override - public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - //RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget_small); - - final int N = appWidgetIds.length; - - for (int i=0; i < N; i++) { - int appWidgetId = appWidgetIds[i]; - - Intent updateIntent = new Intent(context, org.fox.ttrss.widget.WidgetUpdateService.class); - PendingIntent updatePendingIntent = PendingIntent.getService(context, 0, updateIntent, 0); - - Intent intent = new Intent(context, org.fox.ttrss.OnlineActivity.class); - PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); - - RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_small); - views.setOnClickPendingIntent(R.id.widget_main, pendingIntent); - - appWidgetManager.updateAppWidget(appWidgetId, views); - - try { - updatePendingIntent.send(); - } catch (CanceledException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - } - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - - if (FORCE_UPDATE_ACTION.equals(intent.getAction())) { - - AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); - ComponentName thisAppWidget = new ComponentName(context.getPackageName(), SmallWidgetProvider.class.getName()); - int[] appWidgetIds = appWidgetManager.getAppWidgetIds(thisAppWidget); - - onUpdate(context, appWidgetManager, appWidgetIds); - } - } - -} +package org.fox.ttrss.widget; + +import org.fox.ttrss.R; + +import android.app.PendingIntent; +import android.app.PendingIntent.CanceledException; +import android.app.Service; +import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProvider; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.util.Log; +import android.widget.RemoteViews; + +public class SmallWidgetProvider extends AppWidgetProvider { + private final String TAG = this.getClass().getSimpleName(); + + public static final String FORCE_UPDATE_ACTION = "org.fox.ttrss.WIDGET_FORCE_UPDATE"; + + @Override + public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { + //RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget_small); + + final int N = appWidgetIds.length; + + for (int i=0; i < N; i++) { + int appWidgetId = appWidgetIds[i]; + + Intent updateIntent = new Intent(context, org.fox.ttrss.widget.WidgetUpdateService.class); + PendingIntent updatePendingIntent = PendingIntent.getService(context, 0, updateIntent, 0); + + Intent intent = new Intent(context, org.fox.ttrss.OnlineActivity.class); + PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); + + RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_small); + views.setOnClickPendingIntent(R.id.widget_main, pendingIntent); + + appWidgetManager.updateAppWidget(appWidgetId, views); + + try { + updatePendingIntent.send(); + } catch (CanceledException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + } + + @Override + public void onReceive(Context context, Intent intent) { + super.onReceive(context, intent); + + if (FORCE_UPDATE_ACTION.equals(intent.getAction())) { + + AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); + ComponentName thisAppWidget = new ComponentName(context.getPackageName(), SmallWidgetProvider.class.getName()); + int[] appWidgetIds = appWidgetManager.getAppWidgetIds(thisAppWidget); + + onUpdate(context, appWidgetManager, appWidgetIds); + } + } + +} diff --git a/src/org/fox/ttrss/widget/WidgetUpdateService.java b/orgfoxttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java similarity index 96% rename from src/org/fox/ttrss/widget/WidgetUpdateService.java rename to orgfoxttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java index 00c8002f..e45bd301 100644 --- a/src/org/fox/ttrss/widget/WidgetUpdateService.java +++ b/orgfoxttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java @@ -1,141 +1,141 @@ -package org.fox.ttrss.widget; - -import java.util.HashMap; - -import org.fox.ttrss.ApiRequest; -import org.fox.ttrss.R; -import org.fox.ttrss.util.SimpleLoginManager; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import android.app.Service; -import android.appwidget.AppWidgetManager; -import android.content.ComponentName; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.IBinder; -import android.preference.PreferenceManager; -import android.util.Log; -import android.view.View; -import android.widget.RemoteViews; - -public class WidgetUpdateService extends Service { - private final String TAG = this.getClass().getSimpleName(); - - @Override - public IBinder onBind(Intent intent) { - Log.d(TAG, "onBind"); - - // TODO Auto-generated method stub - return null; - } - - /* @Override - public int onStartCommand(Intent intent, int flags, int startId) { - Log.d(TAG, "onStartCommand"); - - return super.onStartCommand(intent, flags, startId); - } */ - - public void update() { - - - } - - @Override - public void onStart(Intent intent, int startId) { - final RemoteViews view = new RemoteViews(getPackageName(), R.layout.widget_small); - - final ComponentName thisWidget = new ComponentName(this, SmallWidgetProvider.class); - final AppWidgetManager manager = AppWidgetManager.getInstance(this); - - try { - view.setTextViewText(R.id.counter, String.valueOf("")); - view.setViewVisibility(R.id.progress, View.VISIBLE); - - manager.updateAppWidget(thisWidget, view); - - final SharedPreferences m_prefs = PreferenceManager - .getDefaultSharedPreferences(getApplicationContext()); - - if (m_prefs.getString("ttrss_url", "").trim().length() == 0) { - - // Toast: need configure - - } else { - - SimpleLoginManager loginManager = new SimpleLoginManager() { - - @Override - protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) { - - ApiRequest aru = new ApiRequest(getApplicationContext()) { - @Override - protected void onPostExecute(JsonElement result) { - if (result != null) { - try { - JsonObject content = result.getAsJsonObject(); - - if (content != null) { - int unread = content.get("unread").getAsInt(); - - view.setViewVisibility(R.id.progress, View.GONE); - view.setTextViewText(R.id.counter, String.valueOf(unread)); - manager.updateAppWidget(thisWidget, view); - - return; - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - view.setViewVisibility(R.id.progress, View.GONE); - view.setTextViewText(R.id.counter, "?"); - manager.updateAppWidget(thisWidget, view); - } - }; - - final String fSessionId = sessionId; - - HashMap umap = new HashMap() { - { - put("op", "getUnread"); - put("sid", fSessionId); - } - }; - - aru.execute(umap); - } - - @Override - protected void onLoginFailed(int requestId, ApiRequest ar) { - - view.setViewVisibility(R.id.progress, View.GONE); - view.setTextViewText(R.id.counter, "?"); - manager.updateAppWidget(thisWidget, view); - } - - @Override - protected void onLoggingIn(int requestId) { - - - } - }; - - String login = m_prefs.getString("login", "").trim(); - String password = m_prefs.getString("password", "").trim(); - - loginManager.logIn(getApplicationContext(), 1, login, password); - } - } catch (Exception e) { - e.printStackTrace(); - - view.setViewVisibility(R.id.progress, View.GONE); - view.setTextViewText(R.id.counter, getString(R.string.app_name)); - manager.updateAppWidget(thisWidget, view); - - } - } -} +package org.fox.ttrss.widget; + +import java.util.HashMap; + +import org.fox.ttrss.ApiRequest; +import org.fox.ttrss.R; +import org.fox.ttrss.util.SimpleLoginManager; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import android.app.Service; +import android.appwidget.AppWidgetManager; +import android.content.ComponentName; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.IBinder; +import android.preference.PreferenceManager; +import android.util.Log; +import android.view.View; +import android.widget.RemoteViews; + +public class WidgetUpdateService extends Service { + private final String TAG = this.getClass().getSimpleName(); + + @Override + public IBinder onBind(Intent intent) { + Log.d(TAG, "onBind"); + + // TODO Auto-generated method stub + return null; + } + + /* @Override + public int onStartCommand(Intent intent, int flags, int startId) { + Log.d(TAG, "onStartCommand"); + + return super.onStartCommand(intent, flags, startId); + } */ + + public void update() { + + + } + + @Override + public void onStart(Intent intent, int startId) { + final RemoteViews view = new RemoteViews(getPackageName(), R.layout.widget_small); + + final ComponentName thisWidget = new ComponentName(this, SmallWidgetProvider.class); + final AppWidgetManager manager = AppWidgetManager.getInstance(this); + + try { + view.setTextViewText(R.id.counter, String.valueOf("")); + view.setViewVisibility(R.id.progress, View.VISIBLE); + + manager.updateAppWidget(thisWidget, view); + + final SharedPreferences m_prefs = PreferenceManager + .getDefaultSharedPreferences(getApplicationContext()); + + if (m_prefs.getString("ttrss_url", "").trim().length() == 0) { + + // Toast: need configure + + } else { + + SimpleLoginManager loginManager = new SimpleLoginManager() { + + @Override + protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) { + + ApiRequest aru = new ApiRequest(getApplicationContext()) { + @Override + protected void onPostExecute(JsonElement result) { + if (result != null) { + try { + JsonObject content = result.getAsJsonObject(); + + if (content != null) { + int unread = content.get("unread").getAsInt(); + + view.setViewVisibility(R.id.progress, View.GONE); + view.setTextViewText(R.id.counter, String.valueOf(unread)); + manager.updateAppWidget(thisWidget, view); + + return; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + view.setViewVisibility(R.id.progress, View.GONE); + view.setTextViewText(R.id.counter, "?"); + manager.updateAppWidget(thisWidget, view); + } + }; + + final String fSessionId = sessionId; + + HashMap umap = new HashMap() { + { + put("op", "getUnread"); + put("sid", fSessionId); + } + }; + + aru.execute(umap); + } + + @Override + protected void onLoginFailed(int requestId, ApiRequest ar) { + + view.setViewVisibility(R.id.progress, View.GONE); + view.setTextViewText(R.id.counter, "?"); + manager.updateAppWidget(thisWidget, view); + } + + @Override + protected void onLoggingIn(int requestId) { + + + } + }; + + String login = m_prefs.getString("login", "").trim(); + String password = m_prefs.getString("password", "").trim(); + + loginManager.logIn(getApplicationContext(), 1, login, password); + } + } catch (Exception e) { + e.printStackTrace(); + + view.setViewVisibility(R.id.progress, View.GONE); + view.setTextViewText(R.id.counter, getString(R.string.app_name)); + manager.updateAppWidget(thisWidget, view); + + } + } +} diff --git a/res/anim/feed_item.xml b/orgfoxttrss/src/main/res/anim/feed_item.xml similarity index 96% rename from res/anim/feed_item.xml rename to orgfoxttrss/src/main/res/anim/feed_item.xml index a60e0556..9f445523 100644 --- a/res/anim/feed_item.xml +++ b/orgfoxttrss/src/main/res/anim/feed_item.xml @@ -1,9 +1,9 @@ - - - - - + + + + + diff --git a/res/anim/headline_item.xml b/orgfoxttrss/src/main/res/anim/headline_item.xml similarity index 96% rename from res/anim/headline_item.xml rename to orgfoxttrss/src/main/res/anim/headline_item.xml index dbb60d23..97c6d40f 100644 --- a/res/anim/headline_item.xml +++ b/orgfoxttrss/src/main/res/anim/headline_item.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + diff --git a/res/anim/layout_feeds.xml b/orgfoxttrss/src/main/res/anim/layout_feeds.xml similarity index 96% rename from res/anim/layout_feeds.xml rename to orgfoxttrss/src/main/res/anim/layout_feeds.xml index 3e7c5003..379508c3 100644 --- a/res/anim/layout_feeds.xml +++ b/orgfoxttrss/src/main/res/anim/layout_feeds.xml @@ -1,5 +1,5 @@ - - + \ No newline at end of file diff --git a/res/anim/layout_headline.xml b/orgfoxttrss/src/main/res/anim/layout_headline.xml similarity index 96% rename from res/anim/layout_headline.xml rename to orgfoxttrss/src/main/res/anim/layout_headline.xml index 07b84d11..ae937110 100644 --- a/res/anim/layout_headline.xml +++ b/orgfoxttrss/src/main/res/anim/layout_headline.xml @@ -1,5 +1,5 @@ - - + \ No newline at end of file diff --git a/res/anim/right_slide_in.xml b/orgfoxttrss/src/main/res/anim/right_slide_in.xml similarity index 100% rename from res/anim/right_slide_in.xml rename to orgfoxttrss/src/main/res/anim/right_slide_in.xml diff --git a/res/anim/right_slide_out.xml b/orgfoxttrss/src/main/res/anim/right_slide_out.xml similarity index 100% rename from res/anim/right_slide_out.xml rename to orgfoxttrss/src/main/res/anim/right_slide_out.xml diff --git a/res/drawable-hdpi/dashclock.png b/orgfoxttrss/src/main/res/drawable-hdpi/dashclock.png similarity index 100% rename from res/drawable-hdpi/dashclock.png rename to orgfoxttrss/src/main/res/drawable-hdpi/dashclock.png diff --git a/res/drawable-hdpi/ic_accept_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_accept_light.png similarity index 100% rename from res/drawable-hdpi/ic_accept_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_accept_light.png diff --git a/res/drawable-hdpi/ic_action_overflow.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_action_overflow.png similarity index 100% rename from res/drawable-hdpi/ic_action_overflow.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_action_overflow.png diff --git a/res/drawable-hdpi/ic_cloud_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_cloud_light.png similarity index 100% rename from res/drawable-hdpi/ic_cloud_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_cloud_light.png diff --git a/res/drawable-hdpi/ic_important_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_important_light.png similarity index 100% rename from res/drawable-hdpi/ic_important_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_important_light.png diff --git a/res/drawable-hdpi/ic_labels_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_labels_light.png similarity index 100% rename from res/drawable-hdpi/ic_labels_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_labels_light.png diff --git a/res/drawable-hdpi/ic_list_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_list_light.png similarity index 100% rename from res/drawable-hdpi/ic_list_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_list_light.png diff --git a/res/drawable-hdpi/ic_menu_attaches_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_menu_attaches_light.png similarity index 100% rename from res/drawable-hdpi/ic_menu_attaches_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_menu_attaches_light.png diff --git a/res/drawable-hdpi/ic_menu_published_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_menu_published_light.png similarity index 100% rename from res/drawable-hdpi/ic_menu_published_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_menu_published_light.png diff --git a/res/drawable-hdpi/ic_menu_unpublished_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_menu_unpublished_light.png similarity index 100% rename from res/drawable-hdpi/ic_menu_unpublished_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_menu_unpublished_light.png diff --git a/res/drawable-hdpi/ic_new_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_new_light.png similarity index 100% rename from res/drawable-hdpi/ic_new_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_new_light.png diff --git a/res/drawable-hdpi/ic_published.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_published.png similarity index 100% rename from res/drawable-hdpi/ic_published.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_published.png diff --git a/res/drawable-hdpi/ic_read_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_read_light.png similarity index 100% rename from res/drawable-hdpi/ic_read_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_read_light.png diff --git a/res/drawable-hdpi/ic_refresh_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_refresh_light.png similarity index 100% rename from res/drawable-hdpi/ic_refresh_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_refresh_light.png diff --git a/res/drawable-hdpi/ic_rotate_left_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_rotate_left_light.png similarity index 100% rename from res/drawable-hdpi/ic_rotate_left_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_rotate_left_light.png diff --git a/res/drawable-hdpi/ic_search_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_search_light.png similarity index 100% rename from res/drawable-hdpi/ic_search_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_search_light.png diff --git a/res/drawable-hdpi/ic_select_all_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_select_all_light.png similarity index 100% rename from res/drawable-hdpi/ic_select_all_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_select_all_light.png diff --git a/res/drawable-hdpi/ic_share_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_share_light.png similarity index 100% rename from res/drawable-hdpi/ic_share_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_share_light.png diff --git a/res/drawable-hdpi/ic_star_empty.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_star_empty.png similarity index 100% rename from res/drawable-hdpi/ic_star_empty.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_star_empty.png diff --git a/res/drawable-hdpi/ic_star_full.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_star_full.png similarity index 100% rename from res/drawable-hdpi/ic_star_full.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_star_full.png diff --git a/res/drawable-hdpi/ic_undo_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_undo_light.png similarity index 100% rename from res/drawable-hdpi/ic_undo_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_undo_light.png diff --git a/res/drawable-hdpi/ic_unimportant_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_unimportant_light.png similarity index 100% rename from res/drawable-hdpi/ic_unimportant_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_unimportant_light.png diff --git a/res/drawable-hdpi/ic_unpublished.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_unpublished.png similarity index 100% rename from res/drawable-hdpi/ic_unpublished.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_unpublished.png diff --git a/res/drawable-hdpi/ic_unread_light.png b/orgfoxttrss/src/main/res/drawable-hdpi/ic_unread_light.png similarity index 100% rename from res/drawable-hdpi/ic_unread_light.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ic_unread_light.png diff --git a/res/drawable-hdpi/icon.png b/orgfoxttrss/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from res/drawable-hdpi/icon.png rename to orgfoxttrss/src/main/res/drawable-hdpi/icon.png diff --git a/res/drawable-hdpi/ics_divider_vertical_bitmap.png b/orgfoxttrss/src/main/res/drawable-hdpi/ics_divider_vertical_bitmap.png similarity index 100% rename from res/drawable-hdpi/ics_divider_vertical_bitmap.png rename to orgfoxttrss/src/main/res/drawable-hdpi/ics_divider_vertical_bitmap.png diff --git a/res/drawable-hdpi/paper_sepia_bitmap.png b/orgfoxttrss/src/main/res/drawable-hdpi/paper_sepia_bitmap.png similarity index 100% rename from res/drawable-hdpi/paper_sepia_bitmap.png rename to orgfoxttrss/src/main/res/drawable-hdpi/paper_sepia_bitmap.png diff --git a/res/drawable-hdpi/shadow_bitmap.png b/orgfoxttrss/src/main/res/drawable-hdpi/shadow_bitmap.png similarity index 100% rename from res/drawable-hdpi/shadow_bitmap.png rename to orgfoxttrss/src/main/res/drawable-hdpi/shadow_bitmap.png diff --git a/res/drawable-xhdpi/dashclock.png b/orgfoxttrss/src/main/res/drawable-xhdpi/dashclock.png similarity index 100% rename from res/drawable-xhdpi/dashclock.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/dashclock.png diff --git a/res/drawable-xhdpi/ic_accept_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_accept_light.png similarity index 100% rename from res/drawable-xhdpi/ic_accept_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_accept_light.png diff --git a/res/drawable-xhdpi/ic_cloud_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_cloud_light.png similarity index 100% rename from res/drawable-xhdpi/ic_cloud_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_cloud_light.png diff --git a/res/drawable-xhdpi/ic_important_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_important_light.png similarity index 100% rename from res/drawable-xhdpi/ic_important_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_important_light.png diff --git a/res/drawable-xhdpi/ic_labels_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_labels_light.png similarity index 100% rename from res/drawable-xhdpi/ic_labels_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_labels_light.png diff --git a/res/drawable-xhdpi/ic_list_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_list_light.png similarity index 100% rename from res/drawable-xhdpi/ic_list_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_list_light.png diff --git a/res/drawable-xhdpi/ic_menu_attaches_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_menu_attaches_light.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_attaches_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_menu_attaches_light.png diff --git a/res/drawable-xhdpi/ic_menu_published_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_menu_published_light.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_published_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_menu_published_light.png diff --git a/res/drawable-xhdpi/ic_menu_unpublished_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_menu_unpublished_light.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_unpublished_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_menu_unpublished_light.png diff --git a/res/drawable-xhdpi/ic_new_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_new_light.png similarity index 100% rename from res/drawable-xhdpi/ic_new_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_new_light.png diff --git a/res/drawable-xhdpi/ic_read_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_read_light.png similarity index 100% rename from res/drawable-xhdpi/ic_read_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_read_light.png diff --git a/res/drawable-xhdpi/ic_refresh_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_refresh_light.png similarity index 100% rename from res/drawable-xhdpi/ic_refresh_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_refresh_light.png diff --git a/res/drawable-xhdpi/ic_rotate_left_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_rotate_left_light.png similarity index 100% rename from res/drawable-xhdpi/ic_rotate_left_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_rotate_left_light.png diff --git a/res/drawable-xhdpi/ic_search_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_search_light.png similarity index 100% rename from res/drawable-xhdpi/ic_search_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_search_light.png diff --git a/res/drawable-xhdpi/ic_select_all_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_select_all_light.png similarity index 100% rename from res/drawable-xhdpi/ic_select_all_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_select_all_light.png diff --git a/res/drawable-xhdpi/ic_share_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_share_light.png similarity index 100% rename from res/drawable-xhdpi/ic_share_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_share_light.png diff --git a/res/drawable-xhdpi/ic_undo_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_undo_light.png similarity index 100% rename from res/drawable-xhdpi/ic_undo_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_undo_light.png diff --git a/res/drawable-xhdpi/ic_unimportant_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_unimportant_light.png similarity index 100% rename from res/drawable-xhdpi/ic_unimportant_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_unimportant_light.png diff --git a/res/drawable-xhdpi/ic_unread_light.png b/orgfoxttrss/src/main/res/drawable-xhdpi/ic_unread_light.png similarity index 100% rename from res/drawable-xhdpi/ic_unread_light.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/ic_unread_light.png diff --git a/res/drawable-xhdpi/icon.png b/orgfoxttrss/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from res/drawable-xhdpi/icon.png rename to orgfoxttrss/src/main/res/drawable-xhdpi/icon.png diff --git a/res/drawable-xxhdpi/icon.png b/orgfoxttrss/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from res/drawable-xxhdpi/icon.png rename to orgfoxttrss/src/main/res/drawable-xxhdpi/icon.png diff --git a/res/drawable/counter_background.xml b/orgfoxttrss/src/main/res/drawable/counter_background.xml similarity index 83% rename from res/drawable/counter_background.xml rename to orgfoxttrss/src/main/res/drawable/counter_background.xml index 15c48553..1c2c4094 100644 --- a/res/drawable/counter_background.xml +++ b/orgfoxttrss/src/main/res/drawable/counter_background.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/res/drawable/counter_background_dark.xml b/orgfoxttrss/src/main/res/drawable/counter_background_dark.xml similarity index 84% rename from res/drawable/counter_background_dark.xml rename to orgfoxttrss/src/main/res/drawable/counter_background_dark.xml index 9dab2d06..3cc971c6 100644 --- a/res/drawable/counter_background_dark.xml +++ b/orgfoxttrss/src/main/res/drawable/counter_background_dark.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/res/drawable/counter_background_selected_light.xml b/orgfoxttrss/src/main/res/drawable/counter_background_selected_light.xml similarity index 84% rename from res/drawable/counter_background_selected_light.xml rename to orgfoxttrss/src/main/res/drawable/counter_background_selected_light.xml index ca0c37da..7485ea00 100644 --- a/res/drawable/counter_background_selected_light.xml +++ b/orgfoxttrss/src/main/res/drawable/counter_background_selected_light.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/res/drawable/counter_background_sepia.xml b/orgfoxttrss/src/main/res/drawable/counter_background_sepia.xml similarity index 84% rename from res/drawable/counter_background_sepia.xml rename to orgfoxttrss/src/main/res/drawable/counter_background_sepia.xml index 478d3cce..daebd494 100644 --- a/res/drawable/counter_background_sepia.xml +++ b/orgfoxttrss/src/main/res/drawable/counter_background_sepia.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/res/drawable/flavor_image_border.xml b/orgfoxttrss/src/main/res/drawable/flavor_image_border.xml similarity index 93% rename from res/drawable/flavor_image_border.xml rename to orgfoxttrss/src/main/res/drawable/flavor_image_border.xml index 3dea012b..f59d75d8 100644 --- a/res/drawable/flavor_image_border.xml +++ b/orgfoxttrss/src/main/res/drawable/flavor_image_border.xml @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row.xml b/orgfoxttrss/src/main/res/drawable/headline_row.xml similarity index 94% rename from res/drawable/headline_row.xml rename to orgfoxttrss/src/main/res/drawable/headline_row.xml index c928013e..ccfb8703 100644 --- a/res/drawable/headline_row.xml +++ b/orgfoxttrss/src/main/res/drawable/headline_row.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_selected.xml b/orgfoxttrss/src/main/res/drawable/headline_row_selected.xml similarity index 94% rename from res/drawable/headline_row_selected.xml rename to orgfoxttrss/src/main/res/drawable/headline_row_selected.xml index 1f30f42f..3f005c8a 100644 --- a/res/drawable/headline_row_selected.xml +++ b/orgfoxttrss/src/main/res/drawable/headline_row_selected.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_selected_sepia.xml b/orgfoxttrss/src/main/res/drawable/headline_row_selected_sepia.xml similarity index 94% rename from res/drawable/headline_row_selected_sepia.xml rename to orgfoxttrss/src/main/res/drawable/headline_row_selected_sepia.xml index 0ed5da7a..17d096e1 100644 --- a/res/drawable/headline_row_selected_sepia.xml +++ b/orgfoxttrss/src/main/res/drawable/headline_row_selected_sepia.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_sepia.xml b/orgfoxttrss/src/main/res/drawable/headline_row_sepia.xml similarity index 94% rename from res/drawable/headline_row_sepia.xml rename to orgfoxttrss/src/main/res/drawable/headline_row_sepia.xml index 5fcb7aa1..facd2b6a 100644 --- a/res/drawable/headline_row_sepia.xml +++ b/orgfoxttrss/src/main/res/drawable/headline_row_sepia.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_unread.xml b/orgfoxttrss/src/main/res/drawable/headline_row_unread.xml similarity index 94% rename from res/drawable/headline_row_unread.xml rename to orgfoxttrss/src/main/res/drawable/headline_row_unread.xml index 14840998..6813164f 100644 --- a/res/drawable/headline_row_unread.xml +++ b/orgfoxttrss/src/main/res/drawable/headline_row_unread.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_unread_sepia.xml b/orgfoxttrss/src/main/res/drawable/headline_row_unread_sepia.xml similarity index 94% rename from res/drawable/headline_row_unread_sepia.xml rename to orgfoxttrss/src/main/res/drawable/headline_row_unread_sepia.xml index f062fb7e..6c649257 100644 --- a/res/drawable/headline_row_unread_sepia.xml +++ b/orgfoxttrss/src/main/res/drawable/headline_row_unread_sepia.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ics_divider_vertical.xml b/orgfoxttrss/src/main/res/drawable/ics_divider_vertical.xml similarity index 97% rename from res/drawable/ics_divider_vertical.xml rename to orgfoxttrss/src/main/res/drawable/ics_divider_vertical.xml index 9967aa1f..14c1f642 100644 --- a/res/drawable/ics_divider_vertical.xml +++ b/orgfoxttrss/src/main/res/drawable/ics_divider_vertical.xml @@ -1,5 +1,5 @@ - - + + diff --git a/res/drawable/ics_divider_vertical_gray.xml b/orgfoxttrss/src/main/res/drawable/ics_divider_vertical_gray.xml similarity index 97% rename from res/drawable/ics_divider_vertical_gray.xml rename to orgfoxttrss/src/main/res/drawable/ics_divider_vertical_gray.xml index 9967aa1f..14c1f642 100644 --- a/res/drawable/ics_divider_vertical_gray.xml +++ b/orgfoxttrss/src/main/res/drawable/ics_divider_vertical_gray.xml @@ -1,5 +1,5 @@ - - + + diff --git a/res/drawable/paper_sepia.xml b/orgfoxttrss/src/main/res/drawable/paper_sepia.xml similarity index 80% rename from res/drawable/paper_sepia.xml rename to orgfoxttrss/src/main/res/drawable/paper_sepia.xml index cbb02489..3951b4c8 100644 --- a/res/drawable/paper_sepia.xml +++ b/orgfoxttrss/src/main/res/drawable/paper_sepia.xml @@ -1,4 +1,4 @@ - - + \ No newline at end of file diff --git a/res/drawable/s_dashclock.svg b/orgfoxttrss/src/main/res/drawable/s_dashclock.svg similarity index 100% rename from res/drawable/s_dashclock.svg rename to orgfoxttrss/src/main/res/drawable/s_dashclock.svg diff --git a/res/drawable/s_headline_published.svg b/orgfoxttrss/src/main/res/drawable/s_headline_published.svg similarity index 100% rename from res/drawable/s_headline_published.svg rename to orgfoxttrss/src/main/res/drawable/s_headline_published.svg diff --git a/res/drawable/s_headline_unpublished.svg b/orgfoxttrss/src/main/res/drawable/s_headline_unpublished.svg similarity index 100% rename from res/drawable/s_headline_unpublished.svg rename to orgfoxttrss/src/main/res/drawable/s_headline_unpublished.svg diff --git a/res/drawable/s_icon.svg b/orgfoxttrss/src/main/res/drawable/s_icon.svg similarity index 100% rename from res/drawable/s_icon.svg rename to orgfoxttrss/src/main/res/drawable/s_icon.svg diff --git a/res/drawable/s_marked.svg b/orgfoxttrss/src/main/res/drawable/s_marked.svg similarity index 100% rename from res/drawable/s_marked.svg rename to orgfoxttrss/src/main/res/drawable/s_marked.svg diff --git a/res/drawable/s_marked_bw.svg b/orgfoxttrss/src/main/res/drawable/s_marked_bw.svg similarity index 100% rename from res/drawable/s_marked_bw.svg rename to orgfoxttrss/src/main/res/drawable/s_marked_bw.svg diff --git a/res/drawable/s_marked_bw_full.svg b/orgfoxttrss/src/main/res/drawable/s_marked_bw_full.svg similarity index 100% rename from res/drawable/s_marked_bw_full.svg rename to orgfoxttrss/src/main/res/drawable/s_marked_bw_full.svg diff --git a/res/drawable/s_menu_attaches_light.svg b/orgfoxttrss/src/main/res/drawable/s_menu_attaches_light.svg similarity index 100% rename from res/drawable/s_menu_attaches_light.svg rename to orgfoxttrss/src/main/res/drawable/s_menu_attaches_light.svg diff --git a/res/drawable/s_menu_marked.svg b/orgfoxttrss/src/main/res/drawable/s_menu_marked.svg similarity index 100% rename from res/drawable/s_menu_marked.svg rename to orgfoxttrss/src/main/res/drawable/s_menu_marked.svg diff --git a/res/drawable/s_menu_published_light.svg b/orgfoxttrss/src/main/res/drawable/s_menu_published_light.svg similarity index 100% rename from res/drawable/s_menu_published_light.svg rename to orgfoxttrss/src/main/res/drawable/s_menu_published_light.svg diff --git a/res/drawable/s_menu_unpublished_light.svg b/orgfoxttrss/src/main/res/drawable/s_menu_unpublished_light.svg similarity index 100% rename from res/drawable/s_menu_unpublished_light.svg rename to orgfoxttrss/src/main/res/drawable/s_menu_unpublished_light.svg diff --git a/res/drawable/s_prev_article.svg b/orgfoxttrss/src/main/res/drawable/s_prev_article.svg similarity index 100% rename from res/drawable/s_prev_article.svg rename to orgfoxttrss/src/main/res/drawable/s_prev_article.svg diff --git a/res/drawable/shadow.xml b/orgfoxttrss/src/main/res/drawable/shadow.xml similarity index 97% rename from res/drawable/shadow.xml rename to orgfoxttrss/src/main/res/drawable/shadow.xml index 51670851..a293378f 100644 --- a/res/drawable/shadow.xml +++ b/orgfoxttrss/src/main/res/drawable/shadow.xml @@ -1,5 +1,5 @@ - - + + diff --git a/res/drawable/shadow_feeds.xml b/orgfoxttrss/src/main/res/drawable/shadow_feeds.xml similarity index 91% rename from res/drawable/shadow_feeds.xml rename to orgfoxttrss/src/main/res/drawable/shadow_feeds.xml index f43427c4..ab71b98d 100644 --- a/res/drawable/shadow_feeds.xml +++ b/orgfoxttrss/src/main/res/drawable/shadow_feeds.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/res/drawable/shadow_feeds_gray.xml b/orgfoxttrss/src/main/res/drawable/shadow_feeds_gray.xml similarity index 92% rename from res/drawable/shadow_feeds_gray.xml rename to orgfoxttrss/src/main/res/drawable/shadow_feeds_gray.xml index b350c5f7..35167a92 100644 --- a/res/drawable/shadow_feeds_gray.xml +++ b/orgfoxttrss/src/main/res/drawable/shadow_feeds_gray.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/res/drawable/shadow_feeds_sepia.xml b/orgfoxttrss/src/main/res/drawable/shadow_feeds_sepia.xml similarity index 91% rename from res/drawable/shadow_feeds_sepia.xml rename to orgfoxttrss/src/main/res/drawable/shadow_feeds_sepia.xml index 8f0ebbbb..30424e15 100644 --- a/res/drawable/shadow_feeds_sepia.xml +++ b/orgfoxttrss/src/main/res/drawable/shadow_feeds_sepia.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/res/drawable/shadow_headlines.xml b/orgfoxttrss/src/main/res/drawable/shadow_headlines.xml similarity index 92% rename from res/drawable/shadow_headlines.xml rename to orgfoxttrss/src/main/res/drawable/shadow_headlines.xml index 7c31ab34..899a8687 100644 --- a/res/drawable/shadow_headlines.xml +++ b/orgfoxttrss/src/main/res/drawable/shadow_headlines.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/res/drawable/shadow_headlines_gray.xml b/orgfoxttrss/src/main/res/drawable/shadow_headlines_gray.xml similarity index 92% rename from res/drawable/shadow_headlines_gray.xml rename to orgfoxttrss/src/main/res/drawable/shadow_headlines_gray.xml index b350c5f7..35167a92 100644 --- a/res/drawable/shadow_headlines_gray.xml +++ b/orgfoxttrss/src/main/res/drawable/shadow_headlines_gray.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/res/drawable/shadow_headlines_sepia.xml b/orgfoxttrss/src/main/res/drawable/shadow_headlines_sepia.xml similarity index 92% rename from res/drawable/shadow_headlines_sepia.xml rename to orgfoxttrss/src/main/res/drawable/shadow_headlines_sepia.xml index 88093571..be7d496c 100644 --- a/res/drawable/shadow_headlines_sepia.xml +++ b/orgfoxttrss/src/main/res/drawable/shadow_headlines_sepia.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/res/layout-sw700dp/headlines.xml b/orgfoxttrss/src/main/res/layout-sw600dp-land/headlines.xml similarity index 96% rename from res/layout-sw700dp/headlines.xml rename to orgfoxttrss/src/main/res/layout-sw600dp-land/headlines.xml index a7cc2c0d..2162232e 100644 --- a/res/layout-sw700dp/headlines.xml +++ b/orgfoxttrss/src/main/res/layout-sw600dp-land/headlines.xml @@ -1,55 +1,55 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw700dp/headlines_articles.xml b/orgfoxttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml similarity index 96% rename from res/layout-sw700dp/headlines_articles.xml rename to orgfoxttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml index aa786015..367f492a 100644 --- a/res/layout-sw700dp/headlines_articles.xml +++ b/orgfoxttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml @@ -1,57 +1,57 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp-port/headlines.xml b/orgfoxttrss/src/main/res/layout-sw600dp-port/headlines.xml similarity index 95% rename from res/layout-sw600dp-port/headlines.xml rename to orgfoxttrss/src/main/res/layout-sw600dp-port/headlines.xml index 5193fab0..e6daa46c 100644 --- a/res/layout-sw600dp-port/headlines.xml +++ b/orgfoxttrss/src/main/res/layout-sw600dp-port/headlines.xml @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp-port/headlines_articles.xml b/orgfoxttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml similarity index 96% rename from res/layout-sw600dp-port/headlines_articles.xml rename to orgfoxttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml index c864d100..36b29751 100644 --- a/res/layout-sw600dp-port/headlines_articles.xml +++ b/orgfoxttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml @@ -1,56 +1,56 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp-land/headlines.xml b/orgfoxttrss/src/main/res/layout-sw700dp/headlines.xml similarity index 96% rename from res/layout-sw600dp-land/headlines.xml rename to orgfoxttrss/src/main/res/layout-sw700dp/headlines.xml index a7cc2c0d..2162232e 100644 --- a/res/layout-sw600dp-land/headlines.xml +++ b/orgfoxttrss/src/main/res/layout-sw700dp/headlines.xml @@ -1,55 +1,55 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp-land/headlines_articles.xml b/orgfoxttrss/src/main/res/layout-sw700dp/headlines_articles.xml similarity index 96% rename from res/layout-sw600dp-land/headlines_articles.xml rename to orgfoxttrss/src/main/res/layout-sw700dp/headlines_articles.xml index aa786015..367f492a 100644 --- a/res/layout-sw600dp-land/headlines_articles.xml +++ b/orgfoxttrss/src/main/res/layout-sw700dp/headlines_articles.xml @@ -1,57 +1,57 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/article_fragment.xml b/orgfoxttrss/src/main/res/layout/article_fragment.xml similarity index 97% rename from res/layout/article_fragment.xml rename to orgfoxttrss/src/main/res/layout/article_fragment.xml index fde7c106..56d42d89 100644 --- a/res/layout/article_fragment.xml +++ b/orgfoxttrss/src/main/res/layout/article_fragment.xml @@ -1,103 +1,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/article_fragment_compat.xml b/orgfoxttrss/src/main/res/layout/article_fragment_compat.xml similarity index 100% rename from res/layout/article_fragment_compat.xml rename to orgfoxttrss/src/main/res/layout/article_fragment_compat.xml diff --git a/res/layout/article_pager.xml b/orgfoxttrss/src/main/res/layout/article_pager.xml similarity index 95% rename from res/layout/article_pager.xml rename to orgfoxttrss/src/main/res/layout/article_pager.xml index 495eac4b..fd5fa057 100644 --- a/res/layout/article_pager.xml +++ b/orgfoxttrss/src/main/res/layout/article_pager.xml @@ -1,22 +1,22 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/res/layout/cats_fragment.xml b/orgfoxttrss/src/main/res/layout/cats_fragment.xml similarity index 96% rename from res/layout/cats_fragment.xml rename to orgfoxttrss/src/main/res/layout/cats_fragment.xml index cc295e1c..4216ebb2 100644 --- a/res/layout/cats_fragment.xml +++ b/orgfoxttrss/src/main/res/layout/cats_fragment.xml @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/dummy_fragment.xml b/orgfoxttrss/src/main/res/layout/dummy_fragment.xml similarity index 92% rename from res/layout/dummy_fragment.xml rename to orgfoxttrss/src/main/res/layout/dummy_fragment.xml index 665e60db..dd1e9876 100644 --- a/res/layout/dummy_fragment.xml +++ b/orgfoxttrss/src/main/res/layout/dummy_fragment.xml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/res/layout/feeds.xml b/orgfoxttrss/src/main/res/layout/feeds.xml similarity index 95% rename from res/layout/feeds.xml rename to orgfoxttrss/src/main/res/layout/feeds.xml index ce021004..8af9c50d 100644 --- a/res/layout/feeds.xml +++ b/orgfoxttrss/src/main/res/layout/feeds.xml @@ -1,29 +1,29 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/feeds_fragment.xml b/orgfoxttrss/src/main/res/layout/feeds_fragment.xml similarity index 96% rename from res/layout/feeds_fragment.xml rename to orgfoxttrss/src/main/res/layout/feeds_fragment.xml index 91648b22..b57f0bac 100644 --- a/res/layout/feeds_fragment.xml +++ b/orgfoxttrss/src/main/res/layout/feeds_fragment.xml @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/feeds_row.xml b/orgfoxttrss/src/main/res/layout/feeds_row.xml similarity index 100% rename from res/layout/feeds_row.xml rename to orgfoxttrss/src/main/res/layout/feeds_row.xml diff --git a/res/layout/feeds_row_selected.xml b/orgfoxttrss/src/main/res/layout/feeds_row_selected.xml similarity index 100% rename from res/layout/feeds_row_selected.xml rename to orgfoxttrss/src/main/res/layout/feeds_row_selected.xml diff --git a/res/layout/headlines.xml b/orgfoxttrss/src/main/res/layout/headlines.xml similarity index 95% rename from res/layout/headlines.xml rename to orgfoxttrss/src/main/res/layout/headlines.xml index 66eeb0fb..4e9bb566 100644 --- a/res/layout/headlines.xml +++ b/orgfoxttrss/src/main/res/layout/headlines.xml @@ -1,29 +1,29 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/headlines_articles.xml b/orgfoxttrss/src/main/res/layout/headlines_articles.xml similarity index 96% rename from res/layout/headlines_articles.xml rename to orgfoxttrss/src/main/res/layout/headlines_articles.xml index 9f477e8a..27895b38 100644 --- a/res/layout/headlines_articles.xml +++ b/orgfoxttrss/src/main/res/layout/headlines_articles.xml @@ -1,50 +1,50 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/headlines_fragment.xml b/orgfoxttrss/src/main/res/layout/headlines_fragment.xml similarity index 96% rename from res/layout/headlines_fragment.xml rename to orgfoxttrss/src/main/res/layout/headlines_fragment.xml index 712da85e..63f7f856 100644 --- a/res/layout/headlines_fragment.xml +++ b/orgfoxttrss/src/main/res/layout/headlines_fragment.xml @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/headlines_row.xml b/orgfoxttrss/src/main/res/layout/headlines_row.xml similarity index 97% rename from res/layout/headlines_row.xml rename to orgfoxttrss/src/main/res/layout/headlines_row.xml index 77233430..52f17ba3 100644 --- a/res/layout/headlines_row.xml +++ b/orgfoxttrss/src/main/res/layout/headlines_row.xml @@ -1,162 +1,162 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/headlines_row_loadmore.xml b/orgfoxttrss/src/main/res/layout/headlines_row_loadmore.xml similarity index 95% rename from res/layout/headlines_row_loadmore.xml rename to orgfoxttrss/src/main/res/layout/headlines_row_loadmore.xml index 053186bd..c8f41688 100644 --- a/res/layout/headlines_row_loadmore.xml +++ b/orgfoxttrss/src/main/res/layout/headlines_row_loadmore.xml @@ -1,26 +1,26 @@ - - + + + + + + + - - - - - \ No newline at end of file diff --git a/res/layout/headlines_row_selected.xml b/orgfoxttrss/src/main/res/layout/headlines_row_selected.xml similarity index 97% rename from res/layout/headlines_row_selected.xml rename to orgfoxttrss/src/main/res/layout/headlines_row_selected.xml index b8c4516a..149ff555 100644 --- a/res/layout/headlines_row_selected.xml +++ b/orgfoxttrss/src/main/res/layout/headlines_row_selected.xml @@ -1,160 +1,160 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/headlines_row_selected_unread.xml b/orgfoxttrss/src/main/res/layout/headlines_row_selected_unread.xml similarity index 97% rename from res/layout/headlines_row_selected_unread.xml rename to orgfoxttrss/src/main/res/layout/headlines_row_selected_unread.xml index 927793c8..833c09e2 100644 --- a/res/layout/headlines_row_selected_unread.xml +++ b/orgfoxttrss/src/main/res/layout/headlines_row_selected_unread.xml @@ -1,161 +1,161 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/headlines_row_unread.xml b/orgfoxttrss/src/main/res/layout/headlines_row_unread.xml similarity index 97% rename from res/layout/headlines_row_unread.xml rename to orgfoxttrss/src/main/res/layout/headlines_row_unread.xml index 107056b9..b5e9d3f6 100644 --- a/res/layout/headlines_row_unread.xml +++ b/orgfoxttrss/src/main/res/layout/headlines_row_unread.xml @@ -1,160 +1,160 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/loading_fragment.xml b/orgfoxttrss/src/main/res/layout/loading_fragment.xml similarity index 97% rename from res/layout/loading_fragment.xml rename to orgfoxttrss/src/main/res/layout/loading_fragment.xml index bc1fd10d..b9b3e977 100644 --- a/res/layout/loading_fragment.xml +++ b/orgfoxttrss/src/main/res/layout/loading_fragment.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + diff --git a/res/layout/login.xml b/orgfoxttrss/src/main/res/layout/login.xml similarity index 94% rename from res/layout/login.xml rename to orgfoxttrss/src/main/res/layout/login.xml index ef6cbcf6..2cfc44b1 100644 --- a/res/layout/login.xml +++ b/orgfoxttrss/src/main/res/layout/login.xml @@ -1,15 +1,15 @@ - - - - + + + + \ No newline at end of file diff --git a/res/layout/select_font_size_dialog.xml b/orgfoxttrss/src/main/res/layout/select_font_size_dialog.xml similarity index 95% rename from res/layout/select_font_size_dialog.xml rename to orgfoxttrss/src/main/res/layout/select_font_size_dialog.xml index 23a05a8b..f77cc151 100644 --- a/res/layout/select_font_size_dialog.xml +++ b/orgfoxttrss/src/main/res/layout/select_font_size_dialog.xml @@ -1,22 +1,22 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/res/layout/share.xml b/orgfoxttrss/src/main/res/layout/share.xml similarity index 96% rename from res/layout/share.xml rename to orgfoxttrss/src/main/res/layout/share.xml index 3b0dd682..dfd09003 100644 --- a/res/layout/share.xml +++ b/orgfoxttrss/src/main/res/layout/share.xml @@ -1,55 +1,55 @@ - - - - - + - - - - - + + + + + + + + + + + +