Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RAD-8 White label FDroid app #1

Merged
merged 17 commits into from Oct 5, 2017
Merged

Conversation

@ghost
Copy link

@ghost ghost commented Sep 28, 2017

No description provided.

Patience Mpofu added 9 commits Sep 28, 2017
This change updates the app theme colors to Jembi green.
It also upgrades the Gradle plugin to the latest for compatibiltiy with Android Studio v2.3.3
This change alters the colors used by the app from blue to green. Note that the names
of the colors remain unchanged. Only the values were changed to Jembi green
<solid android:color="@color/fdroid_blue" />
</shape>
</item>
</selector>

This comment has been minimized.

@timler

timler Oct 2, 2017

@patience-mpofu were there any changes in this file? I quickly compared this file with the original one and can't see any changes.

This comment has been minimized.

@ghost

ghost Oct 2, 2017
Author

The file did not have any changes so I removed it here 391fd34

<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">

<string name="app_name">Jembi App Store</string>

This comment has been minimized.

@timler

timler Oct 2, 2017

@patience-mpofu note that there are many strings.xml files for other languages. because this is just a demo of the white-labelling capabilities, it's OK just to change the en file, but I want to point out that we'd need to (at least consider) changing all the other files too.

@@ -4,7 +4,7 @@
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="org.fdroid.fdroid"
android:targetClass="org.fdroid.fdroid.AboutActivity" />
android:targetClass="AboutActivity" />

This comment has been minimized.

@timler

timler Oct 2, 2017

Not sure about this change on its own - how would it find the AboutActivity without a package name?

@@ -234,8 +234,7 @@ public boolean isLocalRepoHttpsEnabled() {
}

private String getDefaultLocalRepoName() {
return (Build.BRAND + " " + Build.MODEL + new Random().nextInt(9999))
.replaceAll(" ", "-");
return "RAD F-DROID Repo";

This comment has been minimized.

@timler

timler Oct 2, 2017

@patience-mpofu I'm unsure about this change. Firstly, we shouldn't be changing their Java code - we can override Java code in the same way as all the other files (by making a copy into the jembi directory), and secondly, it would be better to try use Build.BRAND, Build.MODEL to get a reasonable name to avoid us having to override the Java.

This comment has been minimized.

@ghost

ghost Oct 2, 2017
Author

Reverted to original 16651cc

@timler
Copy link

@timler timler commented Oct 2, 2017

@patience-mpofu the code is looking great so far 👍


</LinearLayout>

</ScrollView>

This comment has been minimized.

@timler

timler Oct 2, 2017

@patience-mpofu I compared this file with the original, and don't see any changes. I believe this is because all the text for the page comes from strings, so just changing the strings should be enough and this copy can be removed.

This comment has been minimized.

@ghost

ghost Oct 2, 2017
Author

Removed here 02aa092

Patience Mpofu added 5 commits Oct 2, 2017
This change removes a file that was added but has no changes from the original F-Droid version
This change updates the applicationId of the product flavour. Previously errors were generated because the
build could not find classes in package org.fdroid.fdroid
@@ -263,7 +263,7 @@ android {

productFlavors {
jembi {
applicationId "org.jembi.appstore"
applicationId "org.fdroid.fdroid"

This comment has been minimized.

@timler

timler Oct 3, 2017

I think this workaround is going to restrict us in the future, I recommend my third workaround as described in the issue I created here: https://gitlab.com/fdroid/fdroidclient/issues/1180

This comment has been minimized.

@ghost

ghost Oct 3, 2017
Author

Updated here 07b7265

Patience Mpofu and others added 3 commits Oct 3, 2017
This change add a workaround to prevent the app from crashing when preferences are displayed. A ticket has
been opened with F-Droid https://gitlab.com/fdroid/fdroidclient/issues/1180. The workaround will be reverted
once an official fix has been released
Reverting the jembi applicationId change because there is also an issue
when sending the APK via bluetooth. Since it's not required that our
app has a different application id, we decided to minimise further risks
and work with the standard F-Droid applicationId.

https://gitlab.com/fdroid/fdroidclient/issues/1180
@timler timler changed the base branch from master to flavours/jembi-app-store Oct 5, 2017
@timler timler merged commit a702e4e into flavours/jembi-app-store Oct 5, 2017
@timler timler deleted the 8-white_label-fdroid-app branch Oct 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant