From 33d390a2286c42d247653a45e038bf8641f7f8d9 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sun, 6 Oct 2019 22:30:57 +0300 Subject: [PATCH 01/31] CI: development builds are now signed with publically-shared key This commit adds keystore which is shared with community. People freely can use it for creating own Termux app and plugin builds. However, builds signed with such keystore cannot be proven as official. Signed-off-by: Leonid Plyushch --- .cirrus.yml | 32 ++++++-------------------------- app/build.gradle | 13 +++++++++++++ app/dev_keystore.jks | Bin 0 -> 2097 bytes 3 files changed, 19 insertions(+), 26 deletions(-) create mode 100644 app/dev_keystore.jks diff --git a/.cirrus.yml b/.cirrus.yml index 72d9b530..74f9ae13 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,37 +4,17 @@ container: memory: 8G task: - name: Run tests + name: tests script: ./gradlew test task: - name: Build release apk + name: debug-build depends_on: - - Run tests - - environment: - KEYSTORE: ENCRYPTED[e3fa3d741db3c2929acabef0c954e995b7f86d8229f7796199ce6e15ae98cb8eae16b2e498b9daeafff35e1f3aba3f8f] - KEYSTORE_PASSWORD: ENCRYPTED[2761e799baef14b1c822dfcbe5a40ba3ae8e8c13be25563baed28ff35f66e51fa725aa9dcd29c0698023cd04a8ebd604] + - tests build_release_apk_script: | - ./gradlew assembleRelease + ./gradlew assembleDebug - build_apksigner_script: | - cd ../ - git clone https://github.com/fornwall/apksigner - cd apksigner - ./gradlew - cp ./build/libs/apksigner-all.jar /tmp/apksigner.jar - - sign_release_apk_script: | - echo "$KEYSTORE" | base64 -d > keystore.jks - java -jar /tmp/apksigner.jar -p "$KEYSTORE_PASSWORD" keystore.jks \ - ./app/build/outputs/apk/release/app-release-unsigned.apk \ - ./termux-release-g${CIRRUS_CHANGE_IN_REPO:0:8}.apk - - release_artifacts: - path: "./*.apk" - - unsigned_artifacts: - path: "./app/build/outputs/apk/release/*.apk" + output_artifacts: + path: "./app/build/outputs/apk/debug/*.apk" diff --git a/app/build.gradle b/app/build.gradle index b3b1d12e..2bf47f80 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,12 +18,25 @@ android { versionName "0.75" } + signingConfigs { + debug { + storeFile file('dev_keystore.jks') + keyAlias 'alias' + storePassword 'xrj45yWGLbsO7W0v' + keyPassword 'xrj45yWGLbsO7W0v' + } + } + buildTypes { release { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + + debug { + signingConfig signingConfigs.debug + } } compileOptions { diff --git a/app/dev_keystore.jks b/app/dev_keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..174cc95acd605bf557f9e63983f55fadc5ae44bd GIT binary patch literal 2097 zcmezO_TO6u1_mYu1_nkjW=+h=Oe|(#V9cF-S0ixft}icmx!z2_$E{OXx1F`};pc?4Qc4m$ z+_PNy^12;a@=tq)>=De~Bvi{de@95d{)-Rq&6vOVht^6#x9`oye3q#!EFGn5!#Y?R zPRhRRZ#+D~DsBnmjhNzf(k%Pz_pS?R-hJfK)t%g;`!D1WbbaC*#gZe z2KPT7&ynca)ilLue(&kt5B;1kB^Ins%w}j&Esx#*RBO&H4%xM~&pcR);^$xJT_f^d z*d$6*t@vakNl+io3;yq2gDn8c(k_`SX8R4Av(xdURY!onNbJ-4JC|J>0k(yz60?;V+K z>gx_WypQw`ZkMvY`mV%p(*o0T$yE>5{}0P-Ogi|pOiB5#W`|n9%_m7K*=-Ikd$Czq zP|Zs{iB`&`@^Z1>{A)KfD*XTXVd*LbPF11S z2R-M4-L6aD>8KETK0%f9N$H#>zbTbmQ^m~>g<%?imkS;Eq@KJFFJ zKjj(j#&zw>n<_C5Cojv+*0@C~s-;D1&ppkZ+a$-tDE8SzLgb$L{xt#4+PgwddpR_< z{SGQ!6~XNJ_{ijY>|e`YZV}iy@zjO_-|5jwkD||<-+OI}=zpfDDQtbsHb>ru-jG(B zHP>|c8sP&O7ZcmI@A$p;cd>^V&s!nRtLN%Iw%9coUt+kk<|lhZ-PeOjxyzo%*}Xa~ zt9EaH zdUI#rE)3a!$*p|#=YIT zVx#lq{v2x;`{vTt$N73hbZ9wPy9XZKWJL8 z^Je?yRDpxde`~z88mG$gOyyQOk*Sm%>3!0F_jm2n&dU=El5x3w}h-Tl@)mE>0o=}M0^Z;WbEmFj;jY2U0>rEe%)p-qat_hC4rtG3-uC~ zipC$sZv*7SH*zFhcU-D{ZAMbf>>Ul)>i_T8=eQK@;K@;>|3Fp${N9{vD&L&tlY1yuCEVsi)`C!*Y&2b9~J1?2NBGuKcU{pTo&-Uut7E zt=^fj;NU*~ZJPfo*-Re>s54%iQZ?fwzwKiCN04$cLeJE|l7WHgl|d8JGlM3^a|@W6 z7@3$@H1}y%8}PDmYPET^edlFlWMySAFg4^e;9+A9W#QssbxkZP$$;^>VSHf&L6AH% z50_(rw?c4cdR}Ugft)z6p{0SPfw7UXfw7TElsK=6rJ;e5DU?gDu}zFh$PQ#=WngY% zwyUBbj9~Z|1YmupW0IL8lb2laq?qm%VY%cK7ZHi_GvoF*80Z z+d3xOy0q$eOoD*Sb%yki{_XRw$mkXaKHfevZ-=(?(k-k7k^R3oZ>-<@@zXB%s-vs+ zH9b(;_SJDodw=T;b*HntP5!<5pS|+#ZGv^ zEu$4aF#8ML-TbjY;iNEwhI5!y_*(lTlRYGw8?B-RX61IA_^bM)HSGEQH8L~TsdYFW z+Fr$Ien0Fd%VNn5&vq=I@+9=q`Um}o^`m$DOx0Yxc)CGfb!@F+?AE6a88<~tnqsd> z<%86UkKvyy z?Xo)PvwckP)6d-*{4;GYEID+0!_T;T~|TH2~Rm(BR* zNLm-yYsr8t^O-No6mILHQ>9A9cxsk@7}vB4=mUc QbW!hssPK_0k>%H|0QT&fw*UYD literal 0 HcmV?d00001 From 6f11390cc4078fe939ee90c0e1fbf6a3bae91252 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Mon, 7 Oct 2019 00:20:33 +0300 Subject: [PATCH 02/31] update readme --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 3c865508..dec33ef7 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,21 @@ Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages) +## Installing + +It is highly recommended to use [Google Play](https://play.google.com/store/apps/details?id=com.termux) +or [F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux) for +installing application. + +People wanting to try out the latest git changes may install current +development build. It can be obtained directly from [Cirrus CI artifacts](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk). + +Note that signature keys of [Google Play](https://play.google.com/store/apps/details?id=com.termux), +[F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux) and git +builds are different. All must be signed by same key as Termux app. Before +you switch the installation source, you will have to uninstall the Termux +application and all currently installed plugins. + ## Terminal resources - [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html) From 8c7462678f229353ecdafaf973e2b5d5962ef5b4 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Mon, 7 Oct 2019 00:21:57 +0300 Subject: [PATCH 03/31] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dec33ef7..935cffa8 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ People wanting to try out the latest git changes may install current development build. It can be obtained directly from [Cirrus CI artifacts](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk). Note that signature keys of [Google Play](https://play.google.com/store/apps/details?id=com.termux), -[F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux) and git +[F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux) and [git](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk) builds are different. All must be signed by same key as Termux app. Before you switch the installation source, you will have to uninstall the Termux application and all currently installed plugins. From 3f83368f422194c55631e40fa6b4cfd866f1dd2d Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Mon, 7 Oct 2019 15:01:22 +0300 Subject: [PATCH 04/31] CI: update .cirrus.yml --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 74f9ae13..8e6a5449 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,6 +1,6 @@ container: image: cirrusci/android-sdk:28 - cpu: 4 + cpu: 2 memory: 8G task: @@ -13,7 +13,7 @@ task: depends_on: - tests - build_release_apk_script: | + script: | ./gradlew assembleDebug output_artifacts: From cb67e805dedde432478df7fde88030ed95bc1b2d Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Mon, 7 Oct 2019 15:32:21 +0300 Subject: [PATCH 05/31] update readme --- README.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 935cffa8..734fc6a4 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ [Termux](https://termux.com) is an Android terminal application and Linux environment. -- [Termux on Google Play Store](https://play.google.com/store/apps/details?id=com.termux) -- [Termux on F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux) - [Termux Reddit community](https://reddit.com/r/termux) - [Termux Wiki](https://wiki.termux.com/wiki/) - [Termux Twitter](http://twitter.com/termux/) @@ -15,20 +13,21 @@ Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages) -## Installing +## Installation -It is highly recommended to use [Google Play](https://play.google.com/store/apps/details?id=com.termux) -or [F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux) for -installing application. +Termux:Widget application can be obtained from: -People wanting to try out the latest git changes may install current -development build. It can be obtained directly from [Cirrus CI artifacts](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk). +- [Google Play](https://play.google.com/store/apps/details?id=com.termux) +- [F-Droid](https://f-droid.org/en/packages/com.termux/) +- [Kali Nethunter Store](https://store.nethunter.com/en/packages/com.termux/) -Note that signature keys of [Google Play](https://play.google.com/store/apps/details?id=com.termux), -[F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux) and [git](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk) -builds are different. All must be signed by same key as Termux app. Before -you switch the installation source, you will have to uninstall the Termux -application and all currently installed plugins. +Additionally we offer development builds for those who want to try out latest +features ready to be included in future versions. Such build can be obtained +directly from [Cirrus CI artifacts](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk). + +Signature keys of all offered builds are different. Before you switch the +installation source, you will have to uninstall the Termux application and +all currently installed plugins. ## Terminal resources From 4189f598b937217cb70494ccda7b39a9d66426b6 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Wed, 9 Oct 2019 23:00:51 +0300 Subject: [PATCH 06/31] add permission ACCESS_NETWORK_STATE Seems to be required by some Android TV devices. --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 17aecc5c..8d45b965 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,6 +8,7 @@ + From c50a3670632c18c6107e2f25e5b9e7d61ff75c2a Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 13 Oct 2019 20:48:09 +0200 Subject: [PATCH 07/31] Add .cxx folder to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a7327fba..0b3a39ed 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ build/ *.apk *.so .externalNativeBuild +.cxx # Crashlytics configuations com_crashlytics_export_strings.xml From 468f878a382d34cfe102f705c624fca23ab432d6 Mon Sep 17 00:00:00 2001 From: Leon Omelan Date: Sun, 6 Oct 2019 18:06:41 +0200 Subject: [PATCH 08/31] Unified UI colors across the app. Dark sidebar and dark app theme for dark Alert Dialogs --- app/src/main/java/com/termux/app/TermuxActivity.java | 2 +- app/src/main/res/drawable/current_session.xml | 4 ++-- app/src/main/res/drawable/session_ripple.xml | 4 ++-- app/src/main/res/layout/drawer_layout.xml | 2 +- app/src/main/res/values/styles.xml | 11 ++--------- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java index 28f968ce..f3395716 100644 --- a/app/src/main/java/com/termux/app/TermuxActivity.java +++ b/app/src/main/java/com/termux/app/TermuxActivity.java @@ -454,7 +454,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection } else { firstLineView.setPaintFlags(firstLineView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); } - int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? Color.BLACK : Color.RED; + int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? Color.WHITE : Color.RED; firstLineView.setTextColor(color); return row; } diff --git a/app/src/main/res/drawable/current_session.xml b/app/src/main/res/drawable/current_session.xml index e118aa01..6a926499 100644 --- a/app/src/main/res/drawable/current_session.xml +++ b/app/src/main/res/drawable/current_session.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/app/src/main/res/drawable/session_ripple.xml b/app/src/main/res/drawable/session_ripple.xml index f38d75b6..21423eb5 100644 --- a/app/src/main/res/drawable/session_ripple.xml +++ b/app/src/main/res/drawable/session_ripple.xml @@ -2,6 +2,6 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml index c5117f14..14ea1b64 100644 --- a/app/src/main/res/layout/drawer_layout.xml +++ b/app/src/main/res/layout/drawer_layout.xml @@ -26,7 +26,7 @@ android:layout_width="240dp" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@android:color/white" + android:background="@android:color/background_dark" android:choiceMode="singleChoice" android:divider="@android:color/transparent" android:dividerHeight="0dp" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f7c5cc3a..5dac43a1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,14 +3,13 @@ - - - - From 5ba3f7cf6d8b2c29eb4f4d51a6a8961db502500d Mon Sep 17 00:00:00 2001 From: Leon Omelan Date: Mon, 7 Oct 2019 17:15:17 +0200 Subject: [PATCH 09/31] Made Black UI an option to configure --- .../java/com/termux/app/TermuxActivity.java | 28 ++++++++++++++++--- .../com/termux/app/TermuxPreferences.java | 7 +++++ app/src/main/res/drawable/current_session.xml | 2 +- .../res/drawable/current_session_black.xml | 4 +++ .../selected_session_background_black.xml | 5 ++++ app/src/main/res/drawable/session_ripple.xml | 2 +- .../res/drawable/session_ripple_black.xml | 7 +++++ app/src/main/res/layout/drawer_layout.xml | 2 +- app/src/main/res/values/styles.xml | 27 +++++++++++++++++- 9 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/current_session_black.xml create mode 100644 app/src/main/res/drawable/selected_session_background_black.xml create mode 100644 app/src/main/res/drawable/session_ripple_black.xml diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java index f3395716..a84a7be7 100644 --- a/app/src/main/java/com/termux/app/TermuxActivity.java +++ b/app/src/main/java/com/termux/app/TermuxActivity.java @@ -127,6 +127,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection */ boolean mIsVisible; + boolean mIsUsingBlackUI; + final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes( new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build(); @@ -203,11 +205,24 @@ public final class TermuxActivity extends Activity implements ServiceConnection @Override public void onCreate(Bundle bundle) { + mSettings = new TermuxPreferences(this); + mIsUsingBlackUI = mSettings.isUsingBlackUI(); + if (mIsUsingBlackUI) { + this.setTheme(R.style.Theme_Termux_Black); + } else { + this.setTheme(R.style.Theme_Termux); + } + super.onCreate(bundle); - mSettings = new TermuxPreferences(this); - setContentView(R.layout.drawer_layout); + + if (mIsUsingBlackUI) { + findViewById(R.id.left_drawer).setBackgroundColor( + getResources().getColor(android.R.color.background_dark) + ); + } + mTerminalView = findViewById(R.id.terminal_view); mTerminalView.setOnKeyListener(new TermuxViewClient(this)); @@ -434,7 +449,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection boolean sessionRunning = sessionAtRow.isRunning(); TextView firstLineView = row.findViewById(R.id.row_line); - + if (mIsUsingBlackUI) { + firstLineView.setBackground( + getResources().getDrawable(R.drawable.selected_session_background_black) + ); + } String name = sessionAtRow.mSessionName; String sessionTitle = sessionAtRow.getTitle(); @@ -454,7 +473,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection } else { firstLineView.setPaintFlags(firstLineView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); } - int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? Color.WHITE : Color.RED; + int defaultColor = mIsUsingBlackUI ? Color.WHITE : Color.BLACK; + int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? defaultColor : Color.RED; firstLineView.setTextColor(color); return row; } diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java index 16a996ed..f6095837 100644 --- a/app/src/main/java/com/termux/app/TermuxPreferences.java +++ b/app/src/main/java/com/termux/app/TermuxPreferences.java @@ -58,6 +58,7 @@ final class TermuxPreferences { private static final String CURRENT_SESSION_KEY = "current_session"; private static final String SCREEN_ALWAYS_ON_KEY = "screen_always_on"; + private String mUseDarkUI; private boolean mScreenAlwaysOn; private int mFontSize; @@ -126,6 +127,10 @@ final class TermuxPreferences { return mScreenAlwaysOn; } + boolean isUsingBlackUI() { + return mUseDarkUI.toLowerCase().equals("true"); + } + void setScreenAlwaysOn(Context context, boolean newValue) { mScreenAlwaysOn = newValue; PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SCREEN_ALWAYS_ON_KEY, newValue).apply(); @@ -173,6 +178,8 @@ final class TermuxPreferences { break; } + mUseDarkUI = props.getProperty("use-black-ui", "false"); + try { JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[['ESC', 'TAB', 'CTRL', 'ALT', '-', 'DOWN', 'UP']]")); diff --git a/app/src/main/res/drawable/current_session.xml b/app/src/main/res/drawable/current_session.xml index 6a926499..90dd2818 100644 --- a/app/src/main/res/drawable/current_session.xml +++ b/app/src/main/res/drawable/current_session.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/current_session_black.xml b/app/src/main/res/drawable/current_session_black.xml new file mode 100644 index 00000000..6a926499 --- /dev/null +++ b/app/src/main/res/drawable/current_session_black.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/drawable/selected_session_background_black.xml b/app/src/main/res/drawable/selected_session_background_black.xml new file mode 100644 index 00000000..25b7506f --- /dev/null +++ b/app/src/main/res/drawable/selected_session_background_black.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/session_ripple.xml b/app/src/main/res/drawable/session_ripple.xml index 21423eb5..9c4a1e79 100644 --- a/app/src/main/res/drawable/session_ripple.xml +++ b/app/src/main/res/drawable/session_ripple.xml @@ -2,6 +2,6 @@ - + diff --git a/app/src/main/res/drawable/session_ripple_black.xml b/app/src/main/res/drawable/session_ripple_black.xml new file mode 100644 index 00000000..21423eb5 --- /dev/null +++ b/app/src/main/res/drawable/session_ripple_black.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml index 14ea1b64..c5117f14 100644 --- a/app/src/main/res/layout/drawer_layout.xml +++ b/app/src/main/res/layout/drawer_layout.xml @@ -26,7 +26,7 @@ android:layout_width="240dp" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@android:color/background_dark" + android:background="@android:color/white" android:choiceMode="singleChoice" android:divider="@android:color/transparent" android:dividerHeight="0dp" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5dac43a1..1f352423 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,9 +1,34 @@ + + + + -