mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-05 05:12:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,360 Commits 9 Branches 241 Tags
6977412beca8bdcd58298bb4d7f82dcfe7922ea0
Commit Graph

1360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jm Casler
6977412bec updating proto submodule to latest 2021-12-09 11:23:21 -08:00
Jm Casler
8c66268714 Merge branch 'master' of https://github.com/meshtastic/Meshtastic-Android 2021-12-09 09:44:58 -08:00
Jm Casler
404c78eb01 updating androidlib submodule to latest 2021-12-09 09:44:46 -08:00
Jm Casler
56a49c52d1 Merge pull request #317 from andrekir/workflows 
CI build improvements
 2021-12-09 09:39:55 -08:00
Jm Casler
1305976f0e Merge branch 'master' into workflows 2021-12-09 09:36:44 -08:00
Jm Casler
f4f8afba7c updating proto submodule to latest 2021-12-08 23:15:06 -08:00
Jm Casler
a8daea064e updating proto submodule to latest 2021-12-08 18:41:25 -08:00
Jm Casler
3164168951 updating proto submodule to latest 2021-12-08 17:35:27 -08:00
Jm Casler
1a25ab7bdb updating proto submodule to latest 2021-12-07 12:31:44 -08:00
Andre Kirchhoff
7dbc72c455 spacing 2021-12-07 17:05:45 -03:00
Andre Kirchhoff
a1bdb0863a ignore cert keys and mapbox token 2021-12-07 16:11:07 -03:00
Andre Kirchhoff
6fff6ef6dd add google-services.json 2021-12-07 16:04:25 -03:00
Jm Casler
b889108bcf updating proto submodule to latest 2021-12-06 20:17:09 -08:00
Jm Casler
499ba0cb46 updating proto submodule to latest 2021-12-06 19:31:29 -08:00
Andre Kirchhoff
4521779678 mapbox-token.xml 2021-12-01 21:45:32 -03:00
Andre Kirchhoff
7e7f238f91 CI improvements 2021-11-30 10:49:27 -03:00
Jm Casler
cf24c19093 Update README.md to test CI 2021-11-28 13:12:32 -08:00
Jm Casler
6c2de71c5c Merge pull request #313 from andrekir/maxLength 
increase message max length to 228 chars
 2021-11-28 12:48:21 -08:00
Andre Kirchhoff
20e0dda159 maxLength 228 2021-11-28 17:26:06 -03:00
Jm Casler
535ac84ade Merge pull request #312 from andrekir/AndroidCI 
Fix: Android CI / Test
 2021-11-28 12:15:49 -08:00
Andre Kirchhoff
365da25fa1 short_firmware_version --> cur_firmware_version 
SettingsFragment.kt: short_firmware_version --> cur_firmware_version
revert: 56fd43e6f5
 2021-11-28 16:49:54 -03:00
Andre Kirchhoff
72cec7c81e update gradle unmockplugin:0.7.9 2021-11-28 16:42:51 -03:00
Andre Kirchhoff
90c9fe7866 fix mapbox secrets 2021-11-28 16:39:10 -03:00
Jm Casler
6f372ea71c Merge pull request #311 from andrekir/onActionSend 
Fix: PR#293 broke IME_ACTION_DONE
 2021-11-28 11:24:06 -08:00
Andre Kirchhoff
a115392c0f fix local IME Action call 2021-11-28 16:14:34 -03:00
Jm Casler
e0c950edae Merge pull request #307 from andrekir/QRScan 
Feature: Camera QR Code scanning
 2021-11-28 10:27:11 -08:00
Andre Kirchhoff
011ef14f3f cleanup#2 2021-11-20 00:02:34 -03:00
andrekir
bd42397237 add dialog / strings (camera_required & why_camera_required) 2021-11-19 23:35:10 -03:00
andrekir
062dbbc47d camera permissions routine 2021-11-19 01:20:54 -03:00
andrekir
14af474b71 minor details 
all changes (edit, reset, scan) require unlock
 2021-11-17 21:00:46 -03:00
andrekir
3ecc247c76 QR Code scanning with camera 2021-11-17 21:00:46 -03:00
Andre Kirchhoff
e4983d2c2d Merge branch 'meshtastic:master' into master 2021-11-17 20:48:27 -03:00
Kevin Hester
e4c5664e01 Merge pull request #308 from geeksville/dev 
1.2.50
1.2.50 		2021-11-18 04:39:34 +08:00
Kevin Hester
57e1c4847e 1.2.50 2021-11-17 12:36:22 -08:00
Andre Kirchhoff
65d11b6bb7 Mapbox fix attempt #2 2021-11-17 16:13:23 -03:00
Kevin Hester
33dd04ecca fix build 2021-11-17 11:13:02 -08:00
Andre Kirchhoff
6dc26619b5 fix Mapbox lib attempt#1 2021-11-17 15:46:14 -03:00
Kevin Hester
2f19434922 Merge remote-tracking branch 'root/master' into dev 2021-11-17 10:03:28 -08:00
Kevin Hester
1ef41283eb Merge pull request #293 from andrekir/sendButton 
Fix: sendButton / EditText
 2021-11-18 02:02:53 +08:00
Kevin Hester
d867c5c85e Merge branch 'master' into sendButton 2021-11-18 02:02:34 +08:00
Kevin Hester
b8e9b68c0d Merge pull request #295 from srichs/remove-hints 
removed hints from channel inputs
 2021-11-18 02:02:16 +08:00
Kevin Hester
2c50b9890a Merge branch 'master' into remove-hints 2021-11-18 02:02:06 +08:00
Kevin Hester
4eb29fdf46 Merge pull request #296 from andrekir/MessagesFragment 
Fix: MessagesFragment layout
 2021-11-18 02:01:28 +08:00
Kevin Hester
0034bac1e5 Merge remote-tracking branch 'root/master' into dev 2021-11-16 17:36:34 -08:00
Kevin Hester
37c22786e5 update libs 2021-11-16 17:36:02 -08:00
andrekir
f4c754e599 Fix: MessagesFragment layout 
- fix our messages right margin; received left margin (compare "msg.from" to "^local" to "determine if this is my message (originated on this device)";
- night/colors.xml: changed colorMyMsg to #28463C; (colorMsg & colorMyMsg were the same on Dark theme);
- fix val one_day typo (= 86400000 ms/day);
- if errorMessage --> setCardBackgroundColor(Color.RED).
 2021-09-07 22:18:54 -03:00
srichs
0e20ec78db removed hints from channel inputs 2021-09-06 22:43:33 -06:00
andrekir
15161862f3 Fix: EditText with textMultiLine & IME_ACTION_SEND 2021-09-05 15:10:02 -03:00
andrekir
615f202583 minor adjustments, reformat & contentDescription added to messages_fragment.xml 2021-09-02 12:39:16 -03:00
Kevin Hester
781b972c71 Merge pull request #291 from andrekir/sendButton 
Feature: Added Send button
 2021-09-01 10:48:29 -07:00