Skip to content

Commit faee423

Browse files
Merge pull request commons-app#1596 from tanvidadu/imageLicense
Introducing a brief exp of Image License
2 parents b4d556a + a934d24 commit faee423

File tree

3 files changed

+104
-4
lines changed

3 files changed

+104
-4
lines changed

app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Intent;
55
import android.content.SharedPreferences;
66
import android.graphics.Color;
7+
import android.net.Uri;
78
import android.os.Bundle;
89
import android.preference.PreferenceManager;
910
import android.support.annotation.NonNull;
@@ -13,6 +14,7 @@
1314
import android.text.Html;
1415
import android.text.TextWatcher;
1516
import android.text.method.LinkMovementMethod;
17+
import android.util.Log;
1618
import android.view.LayoutInflater;
1719
import android.view.Menu;
1820
import android.view.MenuInflater;
@@ -29,6 +31,7 @@
2931
import android.widget.Toast;
3032

3133
import java.util.ArrayList;
34+
import java.util.Locale;
3235

3336
import javax.inject.Inject;
3437
import javax.inject.Named;
@@ -342,4 +345,17 @@ private void showInfoAlert (int titleStringID, int messageStringID){
342345
.create()
343346
.show();
344347
}
348+
349+
/**
350+
* To launch the Commons:Licensing
351+
* @param view
352+
*/
353+
@OnClick(R.id.licenseInfo)
354+
public void launchLicenseInfo(View view){
355+
Log.i("Language", Locale.getDefault().getLanguage());
356+
UrlLicense urlLicense = new UrlLicense();
357+
urlLicense.initialize();
358+
String url = urlLicense.getLicenseUrl(Locale.getDefault().getLanguage());
359+
Utils.handleWebUrl(getActivity() , Uri.parse(url));
360+
}
345361
}
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package fr.free.nrw.commons.upload;
2+
3+
import java.util.HashMap;
4+
import java.util.Locale;
5+
6+
/**
7+
* This is a Util class which provides the necessary token to open the Commons License
8+
* info in the user language
9+
*/
10+
public class UrlLicense {
11+
HashMap<String,String> urlLicense = new HashMap<String, String>();
12+
public void initialize(){
13+
urlLicense.put("en","https://commons.wikimedia.org/wiki/Commons:Licensing");
14+
urlLicense.put("ar","https://commons.wikimedia.org/wiki/Commons:Licensing/ar");
15+
urlLicense.put("ast","https://commons.wikimedia.org/wiki/Commons:Licensing/ast");
16+
urlLicense.put("az","https://commons.wikimedia.org/wiki/Commons:Licensing/az");
17+
urlLicense.put("be","https://commons.wikimedia.org/wiki/Commons:Licensing/be");
18+
urlLicense.put("bg","https://commons.wikimedia.org/wiki/Commons:Licensing/bg");
19+
urlLicense.put("bn","https://commons.wikimedia.org/wiki/Commons:Licensing/bn");
20+
urlLicense.put("ca","https://commons.wikimedia.org/wiki/Commons:Licensing/ca");
21+
urlLicense.put("cs","https://commons.wikimedia.org/wiki/Commons:Licensing/cs");
22+
urlLicense.put("da","https://commons.wikimedia.org/wiki/Commons:Licensing/da");
23+
urlLicense.put("de","https://commons.wikimedia.org/wiki/Commons:Licensing/de");
24+
urlLicense.put("el","https://commons.wikimedia.org/wiki/Commons:Licensing/el");
25+
urlLicense.put("eo","https://commons.wikimedia.org/wiki/Commons:Licensing/eo");
26+
urlLicense.put("es","https://commons.wikimedia.org/wiki/Commons:Licensing/es");
27+
urlLicense.put("eu","https://commons.wikimedia.org/wiki/Commons:Licensing/eu");
28+
urlLicense.put("fa","https://commons.wikimedia.org/wiki/Commons:Licensing/fa");
29+
urlLicense.put("fi","https://commons.wikimedia.org/wiki/Commons:Licensing/fi");
30+
urlLicense.put("fr","https://commons.wikimedia.org/wiki/Commons:Licensing/fr");
31+
urlLicense.put("gl","https://commons.wikimedia.org/wiki/Commons:Licensing/gl");
32+
urlLicense.put("gsw","https://commons.wikimedia.org/wiki/Commons:Licensing/gsw");
33+
urlLicense.put("he","https://commons.wikimedia.org/wiki/Commons:Licensing/he");
34+
urlLicense.put("hi","https://commons.wikimedia.org/wiki/Commons:Licensing/hi");
35+
urlLicense.put("hu","https://commons.wikimedia.org/wiki/Commons:Licensing/hu");
36+
urlLicense.put("id","https://commons.wikimedia.org/wiki/Commons:Licensing/id");
37+
urlLicense.put("is","https://commons.wikimedia.org/wiki/Commons:Licensing/is");
38+
urlLicense.put("it","https://commons.wikimedia.org/wiki/Commons:Licensing/it");
39+
urlLicense.put("ja","https://commons.wikimedia.org/wiki/Commons:Licensing/ja");
40+
urlLicense.put("ka","https://commons.wikimedia.org/wiki/Commons:Licensing/ka");
41+
urlLicense.put("km","https://commons.wikimedia.org/wiki/Commons:Licensing/km");
42+
urlLicense.put("ko","https://commons.wikimedia.org/wiki/Commons:Licensing/ko");
43+
urlLicense.put("ku","https://commons.wikimedia.org/wiki/Commons:Licensing/ku");
44+
urlLicense.put("mk","https://commons.wikimedia.org/wiki/Commons:Licensing/mk");
45+
urlLicense.put("mr","https://commons.wikimedia.org/wiki/Commons:Licensing/mr");
46+
urlLicense.put("ms","https://commons.wikimedia.org/wiki/Commons:Licensing/ms");
47+
urlLicense.put("my","https://commons.wikimedia.org/wiki/Commons:Licensing/my");
48+
urlLicense.put("nl","https://commons.wikimedia.org/wiki/Commons:Licensing/nl");
49+
urlLicense.put("oc","https://commons.wikimedia.org/wiki/Commons:Licensing/oc");
50+
urlLicense.put("pl","https://commons.wikimedia.org/wiki/Commons:Licensing/pl");
51+
urlLicense.put("pt","https://commons.wikimedia.org/wiki/Commons:Licensing/pt");
52+
urlLicense.put("pt-br","https://commons.wikimedia.org/wiki/Commons:Licensing/pt-br");
53+
urlLicense.put("ro","https://commons.wikimedia.org/wiki/Commons:Licensing/ro");
54+
urlLicense.put("ru","https://commons.wikimedia.org/wiki/Commons:Licensing/ru");
55+
urlLicense.put("scn","https://commons.wikimedia.org/wiki/Commons:Licensing/scn");
56+
urlLicense.put("sk","https://commons.wikimedia.org/wiki/Commons:Licensing/sk");
57+
urlLicense.put("sl","https://commons.wikimedia.org/wiki/Commons:Licensing/sl");
58+
urlLicense.put("sv","https://commons.wikimedia.org/wiki/Commons:Licensing/sv");
59+
urlLicense.put("tr","https://commons.wikimedia.org/wiki/Commons:Licensing/tr");
60+
urlLicense.put("uk","https://commons.wikimedia.org/wiki/Commons:Licensing/uk");
61+
urlLicense.put("ur","https://commons.wikimedia.org/wiki/Commons:Licensing/ur");
62+
urlLicense.put("vi","https://commons.wikimedia.org/wiki/Commons:Licensing/vi");
63+
urlLicense.put("zh","https://commons.wikimedia.org/wiki/Commons:Licensing/zh");
64+
}
65+
public String getLicenseUrl ( String language){
66+
if(urlLicense.containsKey(language)) {
67+
return urlLicense.get(language);
68+
} else {
69+
return urlLicense.get("en");
70+
}
71+
}
72+
}

app/src/main/res/layout/fragment_single_upload.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,23 @@
5555
</android.support.design.widget.TextInputLayout>
5656

5757

58-
<Spinner
59-
android:id="@+id/licenseSpinner"
58+
<LinearLayout
6059
android:layout_width="match_parent"
61-
android:layout_height="wrap_content"
62-
android:theme="?attr/spinnerTheme" />
60+
android:layout_height="wrap_content">
61+
<Spinner
62+
android:id="@+id/licenseSpinner"
63+
android:layout_width="0dp"
64+
android:layout_weight="15"
65+
android:layout_height="wrap_content"
66+
android:theme="?attr/spinnerTheme" />
67+
<TextView
68+
android:layout_width="0dp"
69+
android:layout_weight="1"
70+
android:id="@+id/licenseInfo"
71+
android:layout_height="wrap_content"
72+
android:text="(?)"
73+
android:textColor="@color/primaryTextColor"/>
74+
</LinearLayout>
6375

6476
<Button
6577
android:id="@+id/titleDescButton"

0 commit comments

Comments
 (0)