gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-04 02:25:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,051 Commits 108 Branches 467 Tags 108 MiB
c10a0a7c65
Commit Graph

60 Commits

Author SHA1 Message Date
Andy Scherzinger
c10a0a7c65
make filled buttons Material 3 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-08-11 09:50:48 +02:00
Andy Scherzinger
3a9009231d
fix binding changes 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-08-10 19:22:02 +02:00
Andy Scherzinger
a907b1ba51
fix theming for poll button 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-08-10 19:21:56 +02:00
Andy Scherzinger
e54abe63f1
theme polls and add further theming functions to the utils 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-08-10 19:21:55 +02:00
Andy Scherzinger
0463a39bfb
Add EditText coloring 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-08-10 19:21:55 +02:00
Andy Scherzinger
7ec78e53f0
first steps to theme poll creation 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-08-10 19:21:54 +02:00
Tim Krüger
84f2cf432c
Use singular and plural for vote(s) string 
Resolves: #2265

Signed-off-by: Tim Krüger <t@timkrueger.me>
 2022-08-05 10:27:03 +02:00
Andy Scherzinger
09ddc86c40
Optimize layout and make it accessible 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-08-01 13:43:05 +02:00
Marcel Hibbe
8dfb6ca5aa add loading screen 
this also avoids to doubleclick on end poll button

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
06d9b6f886 rename close poll to end poll in code 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
c3472de802 move checkboxes to left 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
64412a1876 toggle details view on click on avatar views 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
20dabf3a72 wip. toggle between voters overview and voters details 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
f46d2d28f5 close dialog when voted for hidden poll 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
82ffd1f83c add Options in init method 
this avoids adding them again on screen rotation...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
ba6cc7170b initially add 2 option fields and focus question field 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
ca0c045e8d initialize viewModel in onCreate 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
dca7e39905 get variables from parentViewModel 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
139c4412ad move variables from fragment to PollMainViewModel 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
880c656be2 enable/disable submit button by liveData 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
feaf041685 fix cursor jumping to end when editing question 
setting the cursor to the end was just a (buggy) workaround when the question was of type liveData. As it's not liveData anymore, this workaround was now useless

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
6b8c83f553 add dismiss button for edit votes mode 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
9afe4e44d6 fix LiveData value assignment nullability mismatch 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
40f20c56d6 update poll UI for moderators etc 
- allow to end poll for moderators

- allow to see voters amount for voting screen for moderators and creators of the poll

- replace UserEntity with User

- show numVoters instead of votes

- minor refactoring

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
cedbcaefee fix percentage calculation for multiselect polls 
for multiselect polls the total votes must be taken instead amount of voters (one voter can have more than 1 votes..)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
9e8dbb70f3 remove livedata where it's not needed 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
1b13812202 solve klint warnings 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
4c6e4b1c4c add copyright headers 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
23bf072326 fix InstantiationException for more fragments 
followup to a12692ec + get parentViewModel by ViewModelProvider

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
38256fc25d fix compile error from commit a12692ec 
(temporarily...)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
1a000859bf fix InstantiationException for fragments 
fragments must have a public, no-arg constructor.
extra information must be passed as arguments.

With a constructor that receives the data, the following error occurs:

Fragment$InstantiationException: Unable to instantiate fragment ..... could not find Fragment constructor

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
3224ae1e1f improve klint score, minor refactoring 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
b347fbf1b5 rename close poll to end poll (in code) 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:57 +00:00
Marcel Hibbe
bd99245c26 add confirm dialog to end poll 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
73d48a395c show detailed list of voters 
+ refactoring adapter and viewholders for result screen

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
318549a63a wip: show user avatars for closed public polls 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
6447b82969 disable vote button when selection is not changed compared to own votes 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
167aa43ca0 make own votes bold in result screen 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
a95c0d997b make own votes bold in voting screen 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
782d74bfb9 restrict multiselection to maxVotes 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
a4c48b11d6 fix radiobuttons 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
2da4c37a52 remove liveData for selectedOptions 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
acda3d283b add multiselect for poll options 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
8541ebbfc0 add ability to close poll in PollVoteFragment 
this adds duplicate button logic atm. might need to be improved..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
8c898404d1 move details text to PollMainViewModel 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
fbd5e5f5ed show voting screen for open private polls 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
b504af1cd9 add UI logic + close poll system message 
add close poll button (wip/temporarily?)
add "close poll" system message
add UI related logic to PollMainViewModel
add placeholder for pollDetails in UI

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
ea0b7d07cc poll creation: add logic to enable/disable buttons 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
8148bfaa65 add poll system message, klint fixes 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00
Marcel Hibbe
9f90e9c4c6 wip: create poll using multiple livedata fields 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-22 17:54:56 +00:00