Skip to content

Commit 22b0029

Browse files
committed
include ambilwarna library for picking colors
1 parent cecf2fa commit 22b0029

File tree

7 files changed

+26
-0
lines changed

7 files changed

+26
-0
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dependencies {
3131
compile 'com.android.support:appcompat-v7:23.4.0'
3232
compile 'com.jakewharton:butterknife:8.0.1'
3333
compile 'com.squareup:otto:1.3.8'
34+
compile 'com.github.yukuku:ambilwarna:2.0.1'
3435

3536
apt 'com.jakewharton:butterknife-compiler:8.0.1'
3637
}

app/src/main/java/com/simplemobiletools/flashlight/activities/LicenseActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ public void butterKnifeClicked() {
2323
openUrl(R.string.butterknife_url);
2424
}
2525

26+
@OnClick(R.id.license_ambilwarna_title)
27+
public void ambilwarnaClicked() {
28+
openUrl(R.string.ambilwarna_url);
29+
}
30+
2631
@OnClick(R.id.license_otto_title)
2732
public void ottoClicked() {
2833
openUrl(R.string.otto_url);

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,20 @@
3131
android:layout_height="wrap_content"
3232
android:text="@string/butterknife_text"/>
3333

34+
<TextView
35+
android:id="@+id/license_ambilwarna_title"
36+
android:layout_width="match_parent"
37+
android:layout_height="wrap_content"
38+
android:paddingTop="@dimen/activity_margin"
39+
android:text="@string/ambilwarna_title"
40+
android:textColor="@color/colorPrimary"/>
41+
42+
<TextView
43+
android:id="@+id/license_ambilwarna_text"
44+
android:layout_width="wrap_content"
45+
android:layout_height="wrap_content"
46+
android:text="@string/ambilwarna_text"/>
47+
3448
<TextView
3549
android:id="@+id/license_otto_title"
3650
android:layout_width="match_parent"

app/src/main/res/values-it/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
<string name="notice">Questa app usa le seguenti librerie di terze parti per semplificarmi la vita. Grazie.</string>
2626
<string name="third_party_licences">Licenze di terze parti</string>
2727
<string name="butterknife_title">Butter Knife (view injector)</string>
28+
<string name="ambilwarna_title"><u>AmbilWarna (color picker)</u></string>
2829
<string name="otto_title"><u>Otto (event bus)</u></string>
2930
</resources>

app/src/main/res/values-ja/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
<string name="notice">このアプリは、私の人生を容易にするために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。</string>
2626
<string name="third_party_licences">サードパーティー ライセンス</string>
2727
<string name="butterknife_title">Butter Knife (ビュー インジェクター)</string>
28+
<string name="ambilwarna_title"><u>AmbilWarna (color picker)</u></string>
2829
<string name="otto_title"><u>Otto (イベント バス)</u></string>
2930
</resources>

app/src/main/res/values-sv/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
<string name="notice">Denna app använder följande tredjepartsbibliotek för att göra mitt liv enklare. Tack.</string>
2626
<string name="third_party_licences">Tredjepartslicenser</string>
2727
<string name="butterknife_title"><u>Butter Knife (view injector)</u></string>
28+
<string name="ambilwarna_title"><u>AmbilWarna (color picker)</u></string>
2829
<string name="otto_title"><u>Otto (event bus)</u></string>
2930
</resources>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<string name="butterknife_title">Butter Knife (view injector)</string>
2929
<string name="butterknife_text" translatable="false">Copyright 2013 Jake Wharton\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>
3030
<string name="butterknife_url" translatable="false">https://github.com/JakeWharton/butterknife</string>
31+
<string name="ambilwarna_title"><u>AmbilWarna (color picker)</u></string>
32+
<string name="ambilwarna_text" translatable="false">Copyright 2009-2015 Yuku\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>
33+
<string name="ambilwarna_url" translatable="false">https://github.com/yukuku/ambilwarna</string>
3134
<string name="otto_title"><u>Otto (event bus)</u></string>
3235
<string name="otto_text" translatable="false">Copyright 2012 Square, Inc.\nCopyright 2010 Google, Inc.\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>
3336
<string name="otto_url" translatable="false">https://github.com/square/otto</string>

0 commit comments

Comments
 (0)