Skip to content

Commit

Permalink
Merge pull request #133 from sschueller/develop
Browse files Browse the repository at this point in the history 
Release v1.0.27
  • Loading branch information
@sschueller
sschueller committed Feb 17, 2019
2 parents a13d080 + d43131a commit ef8901c
Show file tree
Hide file tree
Showing 29 changed files with 1,117 additions and 107 deletions.
7 changes: 3 additions & 4 deletions README.md
View file
@@ -1,11 +1,9 @@
<h1 align="center">
Android PeerTube Client
Thorium, a Android PeerTube Client
</h1>

<p align="center">
[![Latest release](https://img.shields.io/github/release/sschueller/peertube-android.svg)](https://github.com/sschueller/peertube-android/releases/latest)
[![F-Droid](https://img.shields.io/f-droid/v/net.schueller.peertube.svg)](https://f-droid.org/de/packages/net.schueller.peertube/)
</p>

<h4 align="center">
</h4>
Expand All @@ -16,7 +14,8 @@
</p>

## Download
Beta Test on Google Play: https://play.google.com/store/apps/details?id=net.schueller.peertube
* Beta Test on Google Play: https://play.google.com/store/apps/details?id=net.schueller.peertube
* F-Droid: https://f-droid.org/packages/net.schueller.peertube/

## Features

Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "net.schueller.peertube"
minSdkVersion 21
targetSdkVersion 28
versionCode 1026
versionName "1.0.26"
versionCode 1027
versionName "1.0.27"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ext {
libVersions = [
Expand All @@ -24,7 +24,7 @@ android {
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'de.hdodenhof:circleimageview:3.0.0'

// font awesome
implementation "com.mikepenz:iconics-core:3.1.0"
Expand Down
Binary file modified app/src/main/ic_launcher-web.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/java/net/schueller/peertube/helper/Constants.java
View file
Expand Up @@ -19,6 +19,6 @@

public class Constants {
public static final String THEME_PREF_KEY = "pref_theme";
public static final String DEFAULT_THEME = "AppTheme.ORANGE";
public static final String DEFAULT_THEME = "AppTheme.BLUE";
public static final String BACKGROUND_PLAY_PREF_KEY = "pref_background_play";
}
2 changes: 1 addition & 1 deletion app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
View file
Expand Up @@ -226,7 +226,7 @@ public Bitmap getCurrentLargeIcon(Player player, PlayerNotificationManager.Bitma
}
);

playerNotificationManager.setSmallIcon(R.drawable.ic_peertube_bw);
playerNotificationManager.setSmallIcon(R.drawable.ic_logo_bw);

// don't show skip buttons in notification
playerNotificationManager.setUseNavigationActions(false);
Expand Down
67 changes: 50 additions & 17 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
View file
@@ -1,19 +1,52 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="45.299145"
android:viewportHeight="45.299145">
<group android:translateX="17.731401"
android:translateY="11.649572">
<path
android:pathData="m0.0336,0.34v10.667l8,-5.333"
android:fillColor="#211f20"/>
<path
android:pathData="m0.0336,11.007v10.667l8,-5.333"
android:fillColor="#737373"/>
<path
android:pathData="m8.0336,5.673v10.667l8,-5.333"
android:fillColor="#f1680d"/>

</group>
android:width="108dp"
android:height="108dp"
android:viewportWidth="292.8169"
android:viewportHeight="278.87323">
<group android:translateX="54.96479"
android:translateY="45.161972">
<path
android:pathData="M40.049,33.472H143.216c4.123,0 7.442,3.319 7.442,7.442v98.075c0,4.123 -3.319,7.442 -7.442,7.442H40.049c-4.123,0 -7.442,-3.319 -7.442,-7.442v-98.075c0,-4.123 3.319,-7.442 7.442,-7.442z"
android:strokeAlpha="1"
android:strokeWidth="3"
android:fillColor="#1E88E5"
android:fillAlpha="1"
android:strokeColor="#211f20"/>
<path
android:pathData="M66.23,115.617V72.97h-15.231v-8.683h40.791v8.683H76.594v42.647z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.79270971"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m108.247,64.287v18.872q4.762,-5.567 11.38,-5.567 3.396,0 6.127,1.26 2.731,1.26 4.097,3.221 1.401,1.961 1.891,4.342 0.525,2.381 0.525,7.388v21.814h-9.839V95.974q0,-5.847 -0.56,-7.423 -0.56,-1.576 -1.996,-2.486 -1.401,-0.945 -3.536,-0.945 -2.451,0 -4.377,1.19 -1.926,1.19 -2.836,3.606 -0.875,2.381 -0.875,7.073V115.617H98.408V64.287Z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.79270971"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m122.291,52.191l0,-2.188q0.769,0.341 1.472,0.515 0.702,0.166 1.388,0.166 1.438,0 2.241,-0.753 0.803,-0.761 0.945,-2.252 -0.569,0.396 -1.213,0.595 -0.644,0.198 -1.397,0.198 -1.915,0 -3.094,-1.054 -1.171,-1.062 -1.171,-2.791 0,-1.911 1.305,-3.06 1.313,-1.15 3.512,-1.15 2.442,0 3.78,1.562 1.338,1.562 1.338,4.416 0,2.933 -1.564,4.614 -1.564,1.673 -4.29,1.673 -0.878,0 -1.681,-0.127 -0.803,-0.119 -1.572,-0.365zM126.264,46.49q0.845,0 1.271,-0.515 0.427,-0.523 0.427,-1.562 0,-1.031 -0.427,-1.554 -0.427,-0.523 -1.271,-0.523 -0.845,0 -1.271,0.523 -0.427,0.523 -0.427,1.554 0,1.039 0.427,1.562 0.427,0.515 1.271,0.515z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.41690993"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m140.364,46.522q0,-2.22 -0.443,-3.124 -0.435,-0.912 -1.472,-0.912 -1.037,0 -1.48,0.912 -0.443,0.904 -0.443,3.124 0,2.244 0.443,3.163 0.443,0.92 1.48,0.92 1.029,0 1.472,-0.92 0.443,-0.92 0.443,-3.163zM143.584,46.546q0,2.941 -1.338,4.543 -1.338,1.594 -3.797,1.594 -2.467,0 -3.805,-1.594 -1.338,-1.602 -1.338,-4.543 0,-2.949 1.338,-4.543 1.338,-1.602 3.805,-1.602 2.459,0 3.797,1.602 1.338,1.594 1.338,4.543z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.41690993"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
</group>
</vector>
49 changes: 49 additions & 0 deletions app/src/main/res/drawable/ic_logo.xml
View file
@@ -0,0 +1,49 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp"
android:height="297dp"
android:viewportWidth="210"
android:viewportHeight="297">
<path
android:pathData="M40.049,33.472H143.216c4.123,0 7.442,3.319 7.442,7.442v98.075c0,4.123 -3.319,7.442 -7.442,7.442H40.049c-4.123,0 -7.442,-3.319 -7.442,-7.442v-98.075c0,-4.123 3.319,-7.442 7.442,-7.442z"
android:strokeAlpha="1"
android:strokeWidth="3"
android:fillColor="#1E88E5"
android:fillAlpha="1"
android:strokeColor="#211f20"/>
<path
android:pathData="M66.23,115.617V72.97h-15.231v-8.683h40.791v8.683H76.594v42.647z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.79270971"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m108.247,64.287v18.872q4.762,-5.567 11.38,-5.567 3.396,0 6.127,1.26 2.731,1.26 4.097,3.221 1.401,1.961 1.891,4.342 0.525,2.381 0.525,7.388v21.814h-9.839V95.974q0,-5.847 -0.56,-7.423 -0.56,-1.576 -1.996,-2.486 -1.401,-0.945 -3.536,-0.945 -2.451,0 -4.377,1.19 -1.926,1.19 -2.836,3.606 -0.875,2.381 -0.875,7.073V115.617H98.408V64.287Z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.79270971"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m122.291,52.191l0,-2.188q0.769,0.341 1.472,0.515 0.702,0.166 1.388,0.166 1.438,0 2.241,-0.753 0.803,-0.761 0.945,-2.252 -0.569,0.396 -1.213,0.595 -0.644,0.198 -1.397,0.198 -1.915,0 -3.094,-1.054 -1.171,-1.062 -1.171,-2.791 0,-1.911 1.305,-3.06 1.313,-1.15 3.512,-1.15 2.442,0 3.78,1.562 1.338,1.562 1.338,4.416 0,2.933 -1.564,4.614 -1.564,1.673 -4.29,1.673 -0.878,0 -1.681,-0.127 -0.803,-0.119 -1.572,-0.365zM126.264,46.49q0.845,0 1.271,-0.515 0.427,-0.523 0.427,-1.562 0,-1.031 -0.427,-1.554 -0.427,-0.523 -1.271,-0.523 -0.845,0 -1.271,0.523 -0.427,0.523 -0.427,1.554 0,1.039 0.427,1.562 0.427,0.515 1.271,0.515z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.41690993"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m140.364,46.522q0,-2.22 -0.443,-3.124 -0.435,-0.912 -1.472,-0.912 -1.037,0 -1.48,0.912 -0.443,0.904 -0.443,3.124 0,2.244 0.443,3.163 0.443,0.92 1.48,0.92 1.029,0 1.472,-0.92 0.443,-0.92 0.443,-3.163zM143.584,46.546q0,2.941 -1.338,4.543 -1.338,1.594 -3.797,1.594 -2.467,0 -3.805,-1.594 -1.338,-1.602 -1.338,-4.543 0,-2.949 1.338,-4.543 1.338,-1.602 3.805,-1.602 2.459,0 3.797,1.602 1.338,1.594 1.338,4.543z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.41690993"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
</vector>
49 changes: 49 additions & 0 deletions app/src/main/res/drawable/ic_logo_bw.xml
View file
@@ -0,0 +1,49 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp"
android:height="297dp"
android:viewportWidth="210"
android:viewportHeight="297">
<path
android:pathData="M40.049,33.472H143.216c4.123,0 7.442,3.319 7.442,7.442v98.075c0,4.123 -3.319,7.442 -7.442,7.442H40.049c-4.123,0 -7.442,-3.319 -7.442,-7.442v-98.075c0,-4.123 3.319,-7.442 7.442,-7.442z"
android:strokeAlpha="1"
android:strokeWidth="3"
android:fillColor="#ececec"
android:fillAlpha="0"
android:strokeColor="#211f20"/>
<path
android:pathData="M66.23,115.617V72.97h-15.231v-8.683h40.791v8.683H76.594v42.647z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.79270971"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m108.247,64.287v18.872q4.762,-5.567 11.38,-5.567 3.396,0 6.127,1.26 2.731,1.26 4.097,3.221 1.401,1.961 1.891,4.342 0.525,2.381 0.525,7.388v21.814h-9.839V95.974q0,-5.847 -0.56,-7.423 -0.56,-1.576 -1.996,-2.486 -1.401,-0.945 -3.536,-0.945 -2.451,0 -4.377,1.19 -1.926,1.19 -2.836,3.606 -0.875,2.381 -0.875,7.073V115.617H98.408V64.287Z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.79270971"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m122.291,52.191l0,-2.188q0.769,0.341 1.472,0.515 0.702,0.166 1.388,0.166 1.438,0 2.241,-0.753 0.803,-0.761 0.945,-2.252 -0.569,0.396 -1.213,0.595 -0.644,0.198 -1.397,0.198 -1.915,0 -3.094,-1.054 -1.171,-1.062 -1.171,-2.791 0,-1.911 1.305,-3.06 1.313,-1.15 3.512,-1.15 2.442,0 3.78,1.562 1.338,1.562 1.338,4.416 0,2.933 -1.564,4.614 -1.564,1.673 -4.29,1.673 -0.878,0 -1.681,-0.127 -0.803,-0.119 -1.572,-0.365zM126.264,46.49q0.845,0 1.271,-0.515 0.427,-0.523 0.427,-1.562 0,-1.031 -0.427,-1.554 -0.427,-0.523 -1.271,-0.523 -0.845,0 -1.271,0.523 -0.427,0.523 -0.427,1.554 0,1.039 0.427,1.562 0.427,0.515 1.271,0.515z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.41690993"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m140.364,46.522q0,-2.22 -0.443,-3.124 -0.435,-0.912 -1.472,-0.912 -1.037,0 -1.48,0.912 -0.443,0.904 -0.443,3.124 0,2.244 0.443,3.163 0.443,0.92 1.48,0.92 1.029,0 1.472,-0.92 0.443,-0.92 0.443,-3.163zM143.584,46.546q0,2.941 -1.338,4.543 -1.338,1.594 -3.797,1.594 -2.467,0 -3.805,-1.594 -1.338,-1.602 -1.338,-4.543 0,-2.949 1.338,-4.543 1.338,-1.602 3.805,-1.602 2.459,0 3.797,1.602 1.338,1.594 1.338,4.543z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.41690993"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_peertube.xml
View file
Expand Up @@ -11,6 +11,6 @@
android:fillColor="#737373"/>
<path
android:pathData="m8.0336,5.673v10.667l8,-5.333"
android:fillColor="#f1680d"/>
android:fillColor="#FF0DDEF1"/>

</vector>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ef8901c

Please sign in to comment.