Merge branch '30-navigation-drawer-rebased' into 'master'
Navigation drawer (squashed and rebased). This is @ernir's work on #30 and #181, rebased onto master with recent changes to ConversationActivity and ForumListActivity ported to the respective fragments. See merge request !75
Showing
- briar-android/AndroidManifest.xml 67 additions, 89 deletionsbriar-android/AndroidManifest.xml
- briar-android/res/layout/activity_nav_drawer.xml 73 additions, 0 deletionsbriar-android/res/layout/activity_nav_drawer.xml
- briar-android/res/layout/fragment_dashboard.xml 10 additions, 0 deletionsbriar-android/res/layout/fragment_dashboard.xml
- briar-android/res/layout/navigation_menu.xml 110 additions, 0 deletionsbriar-android/res/layout/navigation_menu.xml
- briar-android/res/values/color.xml 4 additions, 0 deletionsbriar-android/res/values/color.xml
- briar-android/res/values/dimens.xml 2 additions, 0 deletionsbriar-android/res/values/dimens.xml
- briar-android/res/values/strings.xml 13 additions, 2 deletionsbriar-android/res/values/strings.xml
- briar-android/res/values/styles.xml 45 additions, 0 deletionsbriar-android/res/values/styles.xml
- briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java 6 additions, 6 deletions.../briarproject/android/AndroidNotificationManagerImpl.java
- briar-android/src/org/briarproject/android/BriarActivity.java 6 additions, 2 deletions...r-android/src/org/briarproject/android/BriarActivity.java
- briar-android/src/org/briarproject/android/BriarFragmentActivity.java 102 additions, 0 deletions...d/src/org/briarproject/android/BriarFragmentActivity.java
- briar-android/src/org/briarproject/android/BriarService.java 2 additions, 2 deletionsbriar-android/src/org/briarproject/android/BriarService.java
- briar-android/src/org/briarproject/android/NavDrawerActivity.java 407 additions, 0 deletions...droid/src/org/briarproject/android/NavDrawerActivity.java
- briar-android/src/org/briarproject/android/SetupActivity.java 2 additions, 2 deletions...r-android/src/org/briarproject/android/SetupActivity.java
- briar-android/src/org/briarproject/android/SplashScreenActivity.java 1 addition, 1 deletion...id/src/org/briarproject/android/SplashScreenActivity.java
- briar-android/src/org/briarproject/android/TestingConstants.java 2 additions, 2 deletions...ndroid/src/org/briarproject/android/TestingConstants.java
- briar-android/src/org/briarproject/android/contact/ContactListFragment.java 55 additions, 34 deletions...org/briarproject/android/contact/ContactListFragment.java
- briar-android/src/org/briarproject/android/forum/ForumListAdapter.java 2 additions, 2 deletions.../src/org/briarproject/android/forum/ForumListAdapter.java
- briar-android/src/org/briarproject/android/forum/ForumListFragment.java 56 additions, 47 deletions...src/org/briarproject/android/forum/ForumListFragment.java
- briar-android/src/org/briarproject/android/forum/ForumListItemComparator.java 2 additions, 2 deletions...g/briarproject/android/forum/ForumListItemComparator.java
Loading
Please register or sign in to comment