Commit Graph

1665 Commits

Author SHA1 Message Date
Torsten Grote
327073f514 Put conversation view layout in XML file
and fix message divider background for lower API levels.
2015-12-15 13:11:11 -02:00
Torsten Grote
2bd53f8363 Show connection status of contact in conversation view
Closes #97
2015-12-15 13:11:11 -02:00
akwizgran
09774cb362 Don't stretch progress wheel on Android 2.3. 2015-12-15 11:56:00 +00:00
akwizgran
4dd9e25079 Merge branch '52-appcompat-action-bar' into 'master'
Added AppCompatActivity

Closes #52 

See merge request !14
2015-12-15 11:34:03 +00:00
akwizgran
d0ac34e894 Merge branch '153-forum-sharing-with-selected-contacts' into 'master'
Improve Forum Sharing UI when sharing with selected contacts

When sharing only with chosen contacts, checking the contact's checkbox
and pressing Done nothing happens and the forum is not shared. An
additional click on "Share Forum" is necessary to actually share.

This behavior is fixed with this change.
Now, clicking 'Done' immediately shares the forum.

Closes #153

See merge request !20
2015-12-15 10:24:43 +00:00
akwizgran
c4b918c469 Merge branch '156-turn-off-bluetooth' into 'master'
Turn off Bluetooth again when not required anymore

Turn off Bluetooth again when not required anymore and when errors occur.
Also do not turn off Bluetooth when just changing device orientation.

If I didn't oversee something, this closes #156 

See merge request !19
2015-12-15 10:21:20 +00:00
Ernir Erlingsson
cdf8392725 code nitpicks and color fix 2015-12-14 22:22:49 +01:00
Torsten Grote
4d2215a442 Improve Forum Sharing UI when sharing with selected contacts
When sharing only with chosen contacts, checking the contact's checkbox
and pressing Done nothing happens and the forum is not shared. An
additional click on "Share Forum" is necessary to actually share.

This behavior is fixed with this change.
Now, clicking 'Done' immediately shares the forum.

Closes #153
2015-12-14 17:32:52 -02:00
Torsten Grote
e76b326ee2 Turn off Bluetooth again when not required anymore
and when errors occur.
Also do not turn off Bluetooth when just changing device orientation.
2015-12-14 16:19:36 -02:00
akwizgran
3f58af3b04 Merge branch '87-improve-adding-contacts' into 'master'
Improve Adding Contacts

These changes provide more detailed instructions for adding contacts.

Users were confused by the process of adding a contact for the first time.
This change adds additional explanation and a picture of what is going on.

Closes #87

This change also shows the current step and the total number of steps when adding a contact.

Closes #33

The UI was transferred into XML files and lots of redundant code was deleted such as the custom CodeEntryView.

Please note that I did not implement a countdown for Bluetooth discoverability (#71), because of the way how the state machine resets the entire content view of the activity. This should probably be refactored to use fragments which would make the code cleaner and a permanent progress bar easier to implement.

See merge request !15
2015-12-14 17:55:36 +00:00
akwizgran
f6cb3926fb More compact layout for first add contact screen. 2015-12-14 17:43:12 +00:00
Torsten Grote
527ac0c1e0 Show current step and total number of steps when adding a contact.
UI was transferred into XML files
and lots of redundant code was deleted such as the custom CodeEntryView.

Closes #33
2015-12-14 15:02:04 -02:00
Torsten Grote
9e171079cf Merge branch 'activity-padding' into 'master'
Added paddingLeft/Right for devices older than API 17.

Please do the same for any other XML activities you create.

See merge request !17
2015-12-14 16:04:23 +00:00
akwizgran
0aaa2a27ba Don't align if wrapped. 2015-12-14 16:00:40 +00:00
akwizgran
bd2649939a Don't align arguments in method declarations. 2015-12-14 15:55:57 +00:00
akwizgran
b03499ab10 Merge branch 'add-coding-style' into 'master'
Add Coding Style to git

This change adds the coding style file of AndroidStudio to git to be shared and used by all devs for a consistent coding style.

Feel free to adjust the coding style in case this does not properly reflect the current coding style used for the current code in all details.

See merge request !16
2015-12-14 15:54:33 +00:00
akwizgran
0c0388437f Added paddingLeft/Right for older devices. 2015-12-14 15:49:08 +00:00
Torsten Grote
7bef4104b2 add coding style file to git to be shared and used by all devs 2015-12-14 11:47:02 -02:00
Ernir Erlingsson
6ac999c113 Added AppCompatBar and fixed dependencies 2015-12-14 14:03:55 +01:00
Torsten Grote
04be7c9b92 Providing more detailed instructions for adding contacts
Users were confused by the process of adding a contact for the first time.
This change adds additional explanation and a picture of what is going on.

It also moves part of the UI into XML files.

Closes #87
2015-12-14 09:29:55 -02:00
akwizgran
878a70620d Merge branch 'file-utils-refactoring' into 'master'
File utils refactoring

After Ernir merged the two FileUtils implementations I realised two of the three methods are no longer needed and the third can just be a static method, like StringUtils etc.

This patch also fixes a layout problem with PasswordActivity on the Galaxy Nexus - the progress wheel was showing up in the wrong place. (You need a slow phone to notice!)

See merge request !12
2015-12-14 10:37:34 +00:00
akwizgran
f71596c258 Align progress wheel with button. 2015-12-11 11:32:51 +00:00
akwizgran
2687e79593 Refactored FileUtils.
Removed methods that are no longer needed for Java 6, moved the remaining method into the utils directory.
2015-12-10 16:21:47 +00:00
akwizgran
912ba394c5 Refactored FileUtils.
Removed methods that are no longer needed for Java 6, moved the remaining method into the utils directory.
2015-12-10 15:58:52 +00:00
akwizgran
947da886bf Fixed broken tests. 2015-12-10 15:14:50 +00:00
akwizgran
c83d30ba20 Merge branch '46-improve-message-status-indicators' into 'master'
Improve how the status of messages is indicated.

Remove the Toast that always says 'Message Sent' and show graphical
indicators instead that show either:
* message is waiting to be sent
* message was sent (or requested to be sent)
* message was delivered

Please note that I didn't change the icons and did not migrate the UI to XML files to keep my change minimally invasive.

Closes #46

See merge request !9
2015-12-10 13:36:14 +00:00
Torsten Grote
aa7d7642bf make message status persistent and initialize it from database 2015-12-10 11:25:41 -02:00
Torsten Grote
0a8c42b939 Improve how the status of messages is indicated.
Remove the Toast that always says 'Message Sent' and show graphical
indicators instead that show either:
* message is waiting to be sent
* message was sent (or requested)
* message was delivered
2015-12-10 10:11:27 -02:00
akwizgran
18d566ecd2 Merge branch '40-forgotten-password' into 'master'
40 forgotten password

* Moved the UI definition over to XML and added the forgotten password button
* Code encapsulation in a new Base activity also enabling re-use between activities/fragments 

Closes #40 

See merge request !10
2015-12-10 10:40:45 +00:00
Ernir Erlingsson
f033f4fae0 Merge branch '40-forgotten-password' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password
Conflicts:
	briar-android/res/values/strings.xml
	briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
2015-12-10 11:12:10 +01:00
Ernir Erlingsson
b33d8d1ee5 fixed missing string 2015-12-10 11:07:10 +01:00
Ernir Erlingsson
a5fd7ff9dc Added dependency injections for FileUtils and removed redundant code 2015-12-10 11:07:10 +01:00
Ernir Erlingsson
fb2a44c478 code re-structure, mostly nitpicks :) 2015-12-10 11:02:15 +01:00
Ernir Erlingsson
886cad91f0 Added a dialog and refactored code 2015-12-10 11:02:15 +01:00
Ernir Erlingsson
ca00b414e7 Fixed lost code from merge 2015-12-10 11:01:00 +01:00
Ernir Erlingsson
27edc2e3e8 code and ui refactoring in the Password activity, encapsulation and wrappers. 2015-12-10 11:01:00 +01:00
Ernir Erlingsson
0fe514606f removed sneaky iml file 2015-12-10 10:51:09 +01:00
Ernir Erlingsson
8c0f295879 Added dependency injections for FileUtils and removed redundant code 2015-12-10 10:49:28 +01:00
akwizgran
d0342f9a4e Merge branch 'junit-4-not-3' into 'master'
Don't mix JUnit 4's @Test with JUnit3's TestCase.

This is the world's most boring merge request. Android Studio was complaining about using JUnit 4's @Test annotations with JUnit 3's TestCase, so I fixed it.

Most of the changes come from Android Studio organising imports in a different order from Eclipse.

See merge request !8
2015-12-09 13:23:42 +00:00
akwizgran
a5afa2ef93 Merge branch '161-hidden-service-directory' into 'master'
Create hidden service in a subdirectory. #161

The permissions for the parent directory are too permissive (775) for Tor 0.2.7.5. Store the hidden service hostname and private key in a subdirectory with permissions 700.

See merge request !5
2015-12-09 13:21:54 +00:00
Ernir Erlingsson
b83fe85910 code re-structure, mostly nitpicks :) 2015-12-09 11:50:26 +01:00
Ernir Erlingsson
7e9cff3118 Merge branch 'master' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password
Conflicts:
	.gitignore
	briar-android/briar-android.iml
2015-12-09 11:47:53 +01:00
akwizgran
4497612a9d Merge branch '160-improve-gitignore' into 'master'
improved git ignore

closes #160 

See merge request !4
2015-12-09 10:31:44 +00:00
Ernir Erlingsson
2052c8456f Added a dialog and refactored code 2015-12-09 10:29:34 +01:00
Ernir Erlingsson
105b627152 Merge branch '160-improve-gitignore' of https://code.briarproject.org/akwizgran/briar into 160-improve-gitignore
Conflicts:
	.gitignore
2015-12-09 00:35:50 +01:00
Ernir Erlingsson
2a61fa94d1 modified .gitignore and removed *.iml from git 2015-12-09 00:33:22 +01:00
Ernir Erlingsson
74298de1ac improved git ignore 2015-12-09 00:14:13 +01:00
Ernir Erlingsson
428c3dd1b2 Fixed lost code from merge 2015-12-09 00:08:08 +01:00
Ernir Erlingsson
43f562a7bc code and ui refactoring in the Password activity, encapsulation and wrappers. 2015-12-09 00:05:48 +01:00
Ernir Erlingsson
6d13c4e095 improved git ignore 2015-12-08 23:58:59 +01:00