kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into predefined-images

Browse source 
# Conflicts:
#	app/src/main/res/values/settings.xml
This commit is contained in:
RichyHBM 2017-11-28 20:14:40 +00:00
commit e0d5898501
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/shadowice/flocke/andotp/View/EntryViewHolder.java
View file

@ -27,7 +27,6 @@ import android.graphics.ColorFilter;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ImageView;
@ -143,8 +142,8 @@ public class EntryViewHolder extends RecyclerView.ViewHolder
}
public void setLabelSize(int size) {
label.setTextSize(TypedValue.COMPLEX_UNIT_PT, size);
tags.setTextSize(TypedValue.COMPLEX_UNIT_PT, size - 2);
label.setTextSize(size);
tags.setTextSize(0.75f * size);
}
public void setThumbnailSize(int size) {

4
app/src/main/res/layout/component_card.xml
View file

@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="8pt" />
android:textSize="18sp" />
<TextView
android:id="@+id/textViewTags"
@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="6pt" />
android:textSize="13.5sp" />
</LinearLayout>

8
app/src/main/res/values/settings.xml
View file

@ -13,7 +13,7 @@
<string name="settings_key_lang" translatable="false">pref_lang</string>
<string name="settings_key_theme" translatable="false">pref_theme</string>
<string name="settings_key_label_size" translatable="false">pref_label_size</string>
<string name="settings_key_label_size" translatable="false">pref_label_size_sp</string>
<string name="settings_key_label_scroll" translatable="false">pref_label_scroll</string>
<string name="settings_key_thumbnail_visible" translatable="false">pref_thumbnail_visible</string>
<string name="settings_key_thumbnail_size" translatable="false">pref_thumbnail_size</string>
@ -38,7 +38,7 @@
<string name="settings_default_auth" translatable="false">none</string>
<string name="settings_default_lang" translatable="false">system</string>
<string name="settings_default_theme" translatable="false">light</string>
<integer name="settings_default_label_size">8</integer>
<integer name="settings_default_label_size">18</integer>
<string name="settings_default_thumbnail_size">46dp</string>
<!-- All of the possible tile background colors -->
@ -97,6 +97,6 @@
</string-array>
<!-- Constraints -->
<integer name="settings_min_label_size">4</integer>
<integer name="settings_max_label_size">12</integer>
<integer name="settings_min_label_size">12</integer>
<integer name="settings_max_label_size">24</integer>
</resources>

2
build.gradle
View file

@ -8,7 +8,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files