Skip to content

RAD-8 White label FDroid app#1

Merged
timler merged 17 commits into
flavours/jembi-app-storefrom
8-white_label-fdroid-app
Oct 5, 2017
Merged

RAD-8 White label FDroid app#1
timler merged 17 commits into
flavours/jembi-app-storefrom
8-white_label-fdroid-app

Conversation

@ghost

@ghost ghost commented Sep 28, 2017

Copy link
Copy Markdown

No description provided.

Patience Mpofu added 9 commits September 28, 2017 12:41
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> No newline at end of file

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

Comment thread app/src/jembi/res/xml/preferences.xml Outdated
android:action="android.intent.action.MAIN"
android:targetPackage="org.fdroid.fdroid"
android:targetClass="org.fdroid.fdroid.AboutActivity" />
android:targetClass="AboutActivity" />

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted to original 16651cc

@timler

timler commented Oct 2, 2017

Copy link
Copy Markdown

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

Comment thread app/src/jembi/res/layout/about.xml Outdated

</LinearLayout>

</ScrollView>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed here 02aa092

Patience Mpofu added 5 commits October 2, 2017 11:23
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
Comment thread app/build.gradle
productFlavors {
jembi {
applicationId "org.jembi.appstore"
applicationId "org.fdroid.fdroid"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated here 07b7265

Patience Mpofu and others added 3 commits October 3, 2017 11:12
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 October 5, 2017 09:10
@timler timler merged commit a702e4e into flavours/jembi-app-store Oct 5, 2017
@timler timler deleted the 8-white_label-fdroid-app branch October 5, 2017 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant