Merge branch '965-empty-state-messages' into 'master' (309c7a46) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

309c7a46

Commit 309c7a46 authored 7 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '965-empty-state-messages' into 'master'

Shorten and clean up various strings, remove empty forum warning bubble

See merge request akwizgran/briar!741

parents 750f2b1b 7e784c6b

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java 2 additions, 6 deletions

...rg/briarproject/briar/android/forum/ForumListAdapter.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java 1 addition, 4 deletions

...ject/briar/android/privategroup/list/GroupViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java 0 additions, 18 deletions

...a/org/briarproject/briar/android/view/TextAvatarView.java
briar-android/src/main/res/drawable/bubble_problem.xml 0 additions, 21 deletions

briar-android/src/main/res/drawable/bubble_problem.xml
briar-android/src/main/res/values/strings.xml 23 additions, 23 deletions

briar-android/src/main/res/values/strings.xml

with 26 additions and 72 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment