diff --git a/.idea/modules.xml b/.idea/modules.xml index c9d1dc54..5589bc10 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/app/src/main/java/org/piwigo/io/model/ImageListResponse.java b/app/src/main/java/org/piwigo/io/model/ImageListResponse.java index ea42e36f..364df3b9 100644 --- a/app/src/main/java/org/piwigo/io/model/ImageListResponse.java +++ b/app/src/main/java/org/piwigo/io/model/ImageListResponse.java @@ -1,9 +1,22 @@ -package org.piwigo.io.model; - -/** - * Created by Jeff on 7/18/2017. +/* + * Piwigo for Android + * Copyright (C) 2017-2018 Piwigo Team http://piwigo.org + * Copyright (C) 2017-2018 Jeff Ayers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ - +package org.piwigo.io.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/org/piwigo/io/model/ImageUploadResponse.java b/app/src/main/java/org/piwigo/io/model/ImageUploadResponse.java index 7f5ec038..f25a962c 100644 --- a/app/src/main/java/org/piwigo/io/model/ImageUploadResponse.java +++ b/app/src/main/java/org/piwigo/io/model/ImageUploadResponse.java @@ -1,13 +1,26 @@ +/* + * Piwigo for Android + * Copyright (C) 2017-2018 Piwigo Team http://piwigo.org + * Copyright (C) 2017-2018 Jeff Ayers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package org.piwigo.io.model; import com.google.gson.annotations.SerializedName; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by Jeff on 6/24/2017. - */ public class ImageUploadResponse { diff --git a/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java b/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java index 6dad2604..c7438295 100644 --- a/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java +++ b/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java @@ -103,6 +103,4 @@ private class CategoryViewBinder implements BindingRecyclerViewAdapter.ViewBinde viewHolder.getBinding().setVariable(BR.viewModel, viewModel); } } - - } diff --git a/app/src/main/java/org/piwigo/ui/main/MainActivity.java b/app/src/main/java/org/piwigo/ui/main/MainActivity.java index a6f3eb6e..2bd97597 100644 --- a/app/src/main/java/org/piwigo/ui/main/MainActivity.java +++ b/app/src/main/java/org/piwigo/ui/main/MainActivity.java @@ -206,6 +206,8 @@ public void onRequestPermissionsResult(int requestCode, // permission denied, boo! Disable the // functionality that depends on this permission. Toast.makeText(this,"File access denied - go to Settings - Applications - Piwigo to manually give Storage permission",Toast.LENGTH_LONG).show(); +//TODO + selectPhoto(); } return; } @@ -215,8 +217,6 @@ public void onRequestPermissionsResult(int requestCode, } } - - private void selectPhoto(){ Intent intent = new Intent(); intent.setType("image/*"); @@ -224,7 +224,8 @@ private void selectPhoto(){ intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); } intent.setAction(Intent.ACTION_GET_CONTENT); - startActivityForResult(Intent.createChooser(intent,"Select Picture"), SELECT_PICTURES); + startActivityForResult(Intent.createChooser(intent, + getResources().getString(R.string.title_select_image)), SELECT_PICTURES); } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 47535c74..fb93c0d8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,6 +24,7 @@ Login Manage Accounts About + "Select Image Piwigo logo