Skip to content

[WIP] Complete UI Refresh with Material Design Theming #820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] Complete UI Refresh with Material Design Theming #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b9a9b7
Refactor UI implentation with the new AndroidX or Material Design lib…
cognition9144 Aug 15, 2019
a5cd230
Update build tools
cognition9144 Aug 27, 2019
bd1608e
Minor fixes
cognition9144 Aug 29, 2019
77fee2c
Polish article list, tag list, and article behaviors
cognition9144 Aug 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jdk:
android:
components:
- tools
- build-tools-28.0.3
- android-28
- build-tools-29.0.2
- android-29
- extra-android-m2repository
licenses:
- ".+"
Expand Down
19 changes: 11 additions & 8 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ apply plugin: 'com.android.application'
apply plugin: 'org.greenrobot.greendao'

android {
compileSdkVersion 28
compileSdkVersion 29

defaultConfig {
applicationId "fr.gaulupeau.apps.InThePoche"
minSdkVersion 21
targetSdkVersion 28
minSdkVersion 24
targetSdkVersion 29
versionCode 215
versionName "2.3.0-beta.1"

javaCompileOptions {
annotationProcessorOptions {
arguments = [ eventBusIndex : 'fr.gaulupeau.apps.Poche.EventBusIndex' ]
arguments = [eventBusIndex: 'fr.gaulupeau.apps.Poche.EventBusIndex']
}
}
}
Expand All @@ -33,8 +33,9 @@ android {

buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
multiDexEnabled = true
}
debug {
applicationIdSuffix '.debug'
Expand All @@ -50,6 +51,7 @@ android {
}
}
}
buildToolsVersion = '29.0.2'
}

greendao {
Expand All @@ -58,10 +60,11 @@ greendao {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
implementation 'androidx.preference:preference:1.1.0-rc01'
implementation 'com.google.android.material:material:1.1.0-alpha09'
implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'org.greenrobot:greendao:3.2.2'
annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.1.1'
Expand Down
125 changes: 68 additions & 57 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="fr.gaulupeau.apps.InThePoche"
android:installLocation="auto">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="22"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- needed by TTS service for Android P or above -->
xmlns:tools="http://schemas.android.com/tools"
package="fr.gaulupeau.apps.InThePoche"
android:installLocation="auto">

<application
android:name="fr.gaulupeau.apps.Poche.App"
android:allowBackup="true"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:supportsRtl="true"
android:theme="@style/LightTheme"
android:networkSecurityConfig="@xml/network_security_config">
android:theme="@style/MyTheme.DayNight">
<activity
android:name="fr.gaulupeau.apps.Poche.ui.MainActivity"
android:theme="@style/LightTheme.NoActionBar">
android:name="fr.gaulupeau.apps.Poche.ui.preferences.SettingsActivity"
android:label="@string/title_activity_settings"
android:parentActivityName="fr.gaulupeau.apps.Poche.ui.MainActivity"
android:theme="@style/MyTheme.DayNight">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="fr.gaulupeau.apps.Poche.ui.MainActivity" />
</activity>
<activity android:name="fr.gaulupeau.apps.Poche.ui.MainActivity"
android:theme="@style/MyTheme.DayNight">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.SEARCH"/>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.SEARCH" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable"/>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>
<activity
android:name="fr.gaulupeau.apps.Poche.ui.ReadArticleActivity"
android:hardwareAccelerated="true" />
<activity
android:name="fr.gaulupeau.apps.Poche.ui.ManageArticleTagsActivity"/>
android:hardwareAccelerated="true"
android:theme="@style/MyTheme.DayNight"/>
<activity android:name="fr.gaulupeau.apps.Poche.ui.ManageArticleTagsActivity" />
<activity
android:name="fr.gaulupeau.apps.Poche.ui.AddUrlProxyActivity"
android:theme="@style/ProxyTheme">
android:theme="@style/MyTheme.DayNight">
<intent-filter android:label="@string/app_name">
<action android:name="android.intent.action.SEND" />

Expand All @@ -52,7 +56,7 @@
android:enabled="false"
android:excludeFromRecents="true"
android:noHistory="true"
android:theme="@style/ProxyTheme">
android:theme="@style/MyTheme.DayNight">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

Expand All @@ -76,37 +80,40 @@
<data android:mimeType="application/vnd.wap.xhtml+xml" />
</intent-filter>
</activity>

<activity android:name="fr.gaulupeau.apps.Poche.ui.preferences.SettingsActivity">
<activity android:name="fr.gaulupeau.apps.Poche.ui.preferences.SettingsActivity$SyncFragment">
<intent-filter>
<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity android:name="fr.gaulupeau.apps.Poche.ui.preferences.ConnectionWizardActivity">
<activity android:name="fr.gaulupeau.apps.Poche.ui.preferences.ConnectionWizardActivity"
android:theme="@style/MyTheme.DayNight">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="wallabag"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="wallabag" />
</intent-filter>
</activity>

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>

<receiver android:name="androidx.media.session.MediaButtonReceiver">
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
</receiver>

<service
android:name="fr.gaulupeau.apps.Poche.tts.TtsService"
android:exported="false">
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
</service>

<receiver android:name="fr.gaulupeau.apps.Poche.ui.IconUnreadWidget">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
Expand All @@ -120,8 +127,9 @@
android:name="fr.gaulupeau.apps.Poche.network.ConnectivityChangeReceiver"
android:enabled="false">
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"
tools:ignore="BatteryLife" />
<action
android:name="android.net.conn.CONNECTIVITY_CHANGE"
tools:ignore="BatteryLife" />
</intent-filter>
</receiver>
<receiver
Expand All @@ -135,28 +143,31 @@
android:name="fr.gaulupeau.apps.Poche.service.AlarmReceiver"
android:enabled="false" />

<service
android:name="fr.gaulupeau.apps.Poche.tts.TtsService"
android:exported="false">
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
</service>
<service
android:name="fr.gaulupeau.apps.Poche.service.WallabagJobService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="true" />

android:exported="true"
android:permission="android.permission.BIND_JOB_SERVICE" />
<service
android:name="fr.gaulupeau.apps.Poche.service.MainService"
android:exported="false" />

<service
android:name="fr.gaulupeau.apps.Poche.service.SecondaryService"
android:exported="false" />

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"/>
</provider>
</application>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="22" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

</manifest>
</manifest>
Binary file added app/src/main/assets/fonts/librefranklin_400.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/assets/fonts/merriweather_400.ttf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions app/src/main/assets/ic_web.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading