Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'text-all-caps' into 'master'

Browse Source 
Use proper way to set text all caps on old api

See merge request !521
This commit is contained in:
Peter Serwylo 2017-05-26 02:57:05 +00:00
commit e46fccce95
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -12,7 +12,6 @@ import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
import android.support.v4.widget.TextViewCompat; import android.support.v4.widget.TextViewCompat;
import android.support.v7.text.AllCapsTransformationMethod;
import android.support.v7.widget.GridLayout; import android.support.v7.widget.GridLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@ -358,11 +357,6 @@ public class AppDetailsRecyclerViewAdapter
updateAntiFeaturesWarning(); updateAntiFeaturesWarning();
} }
}); });
// Set ALL caps (in a way compatible with SDK 10)
AllCapsTransformationMethod allCapsTransformation = new AllCapsTransformationMethod(view.getContext());
buttonPrimaryView.setTransformationMethod(allCapsTransformation);
buttonSecondaryView.setTransformationMethod(allCapsTransformation);
descriptionMoreView.setTransformationMethod(allCapsTransformation);
} }
public void setProgress(int bytesDownloaded, int totalBytes, int resIdString) { public void setProgress(int bytesDownloaded, int totalBytes, int resIdString) {

9
app/src/main/res/layout/app_details2_header.xml
View File

@ -151,17 +151,18 @@
android:visibility="visible" android:visibility="visible"
> >
<Button <android.support.v7.widget.AppCompatButton
android:id="@+id/secondaryButtonView" android:id="@+id/secondaryButtonView"
style="@style/DetailsSecondaryButtonStyle" style="@style/DetailsSecondaryButtonStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="marquee" android:ellipsize="marquee"
app:textAllCaps="true"
android:padding="12dp" android:padding="12dp"
tools:text="Uninstall" /> tools:text="Uninstall" />
<Button <android.support.v7.widget.AppCompatButton
android:id="@+id/primaryButtonView" android:id="@+id/primaryButtonView"
style="@style/DetailsPrimaryButtonStyle" style="@style/DetailsPrimaryButtonStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -170,6 +171,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="marquee" android:ellipsize="marquee"
app:textAllCaps="true"
tools:text="Run" /> tools:text="Run" />
</LinearLayout> </LinearLayout>
@ -233,7 +235,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="\t• This app tracks and reports your activity." /> tools:text="\t• This app tracks and reports your activity." />
<TextView <android.support.v7.widget.AppCompatTextView
android:id="@+id/description_more" android:id="@+id/description_more"
style="@style/DetailsMoreButtonStyle" style="@style/DetailsMoreButtonStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -244,6 +246,7 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:gravity="end" android:gravity="end"
android:text="@string/more" android:text="@string/more"
android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="more" /> tools:text="more" />