fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove Exoplayer

This commit is contained in:
tibbi 2016-06-08 20:50:42 +02:00
parent 28988becd0
commit c1b112c57d
4 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -34,7 +34,6 @@ dependencies {
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
compile 'com.jakewharton:butterknife:8.0.1'
compile 'com.google.android.exoplayer:exoplayer:r1.5.8'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
}

5
app/src/main/java/com/simplemobiletools/gallery/activities/LicenseActivity.java
View File

@ -28,11 +28,6 @@ public class LicenseActivity extends AppCompatActivity {
openUrl(R.string.subsampling_url);
}
@OnClick(R.id.license_exoplayer_title)
public void exoplayerClicked() {
openUrl(R.string.exoplayer_url);
}
private void openUrl(int id) {
final String url = getResources().getString(id);
final Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));

14
app/src/main/res/layout/activity_license.xml
View File

@ -59,19 +59,5 @@
android:layout_height="wrap_content"
android:text="@string/glide_text"/>
<TextView
android:id="@+id/license_exoplayer_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin"
android:text="@string/exoplayer_title"
android:textColor="@color/colorPrimary"/>
<TextView
android:id="@+id/exoplayer_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/exoplayer_text"/>
</LinearLayout>
</ScrollView>

3
app/src/main/res/values/strings.xml
View File

@ -51,8 +51,5 @@
<string name="glide_title"><u>Glide (image loading and caching)</u></string>
<string name="glide_text">Copyright 2014 Google, Inc. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</string>
<string name="glide_url">https://github.com/bumptech/glide</string>
<string name="exoplayer_title"><u>ExoPlayer (playing videos)</u></string>
<string name="exoplayer_text">Copyright 2016 Google\n\nLicensed 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\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless 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.</string>
<string name="exoplayer_url">https://github.com/google/ExoPlayer</string>
</resources>