Skip to content

Commit

Permalink
rename project
Browse files Browse the repository at this point in the history
  • Loading branch information
3003h committed Mar 19, 2024
1 parent 2b3957e commit e859b60
Show file tree
Hide file tree
Showing 281 changed files with 1,320 additions and 1,274 deletions.
18 changes: 9 additions & 9 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ body:
- type: markdown
attributes:
value: |
感谢您愿意为 FEhViewer 做出贡献!
感谢您愿意为 Eros-FE 做出贡献!
提交问题报告前,还请首先完成文末的自查步骤
Thanks for your contribution to the FEhViewer Project!
Thanks for your contribution to the Eros-FE Project!
Please complete the self-review steps at the end of the article before submitting the bug report
- type: textarea
Expand Down Expand Up @@ -69,7 +69,7 @@ body:
- type: input
id: version
attributes:
label: FEhViewer 版本号 / FEhViewer version code
label: Eros-FE 版本号 / Eros-FE version code
description: |
您可以在 设置 - 关于 处找到版本号
You can get version code in Settings - About
Expand All @@ -80,11 +80,11 @@ body:
- type: input
id: ci
attributes:
label: FEhViewer CI 版本 / FEhViewer CI version
label: Eros-FE CI 版本 / Eros-FE CI version
description: |
请确保您已经使用 [最新 CI 版本](https://github.com/3003h/FEhViewer/actions/workflows/release.yml) 测试,请填入您使用的 CI 版本网址
Please make sure you have tested with the [latest CI version](https://github.com/3003h/FEhViewer/actions/workflows/release.yml), simply drop GitHub Action CI download page url here
placeholder: https://github.com/3003h/FEhViewer/actions/runs/XXXXXXXXXX
请确保您已经使用 [最新 CI 版本](https://github.com/3003h/Eros-FE/actions/workflows/release.yml) 测试,请填入您使用的 CI 版本网址
Please make sure you have tested with the [latest CI version](https://github.com/3003h/Eros-FE/actions/workflows/release.yml), simply drop GitHub Action CI download page url here
placeholder: https://github.com/3003h/Eros-FE/actions/runs/XXXXXXXXXX
validations:
required: true

Expand Down Expand Up @@ -144,11 +144,11 @@ body:
- label: 如果您有足够的时间和能力,并愿意为修复此问题提交 PR ,请勾上此复选框 / Pull request is welcome. Check this if you want to start a pull request
required: false

- label: 您已搜索过 [Issue Tracker](https://github.com/3003h/FEhViewer/issues),没有找到类似的问题 / I have searched on [Issue Tracker](https://github.com/3003h/FEhViewer/issues), No duplicate or related open issue has been found
- label: 您已搜索过 [Issue Tracker](https://github.com/3003h/Eros-FE/issues),没有找到类似的问题 / I have searched on [Issue Tracker](https://github.com/3003h/FEhViewer/issues), No duplicate or related open issue has been found
required: true

- label: 您确保这个 Issue 只提及一个问题。如果您有多个问题报告,烦请发起多个 Issue / Ensure there is only one bug report in this issue. Please make mutiply issue for mutiply bugs
required: true

- label: 您确保已使用 [最新 CI 版本](https://github.com/3003h/FEhViewer/actions/workflows/release.yml) 测试,并且该问题在最新 CI 版本中并未解决 / This bug have not solved in [latest CI version](https://github.com/3003h/FEhViewer/actions/workflows/release.yml)
- label: 您确保已使用 [最新 CI 版本](https://github.com/3003h/Eros-FE/actions/workflows/release.yml) 测试,并且该问题在最新 CI 版本中并未解决 / This bug have not solved in [latest CI version](https://github.com/3003h/FEhViewer/actions/workflows/release.yml)
required: true
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
- type: markdown
attributes:
value: |
感谢您愿意为 FEhViewer 做出贡献!
感谢您愿意为 Eros-FE 做出贡献!
提交功能请求前,还请首先完成文末的自查步骤
Thanks for your contribution to the FEhViewer Project!
Thanks for your contribution to the Eros-FE Project!
Please complete the self-review steps at the end of the article before submitting the feature request

- type: textarea
Expand Down Expand Up @@ -49,7 +49,7 @@
- label: 如果您有足够的时间和能力,并愿意为此功能请求提交 PR ,请勾上此复选框 / Pull request is welcome. Check this if you want to start a pull request
required: false

- label: 您已搜索过 [Issue Tracker](https://github.com/3003h/FEhViewer/issues),没有找到类似的请求 / I have searched on [Issue Tracker](https://github.com/3003h/FEhViewer/issues), No duplicate or related open issue has been found
- label: 您已搜索过 [Issue Tracker](https://github.com/3003h/Eros-FE/issues),没有找到类似的请求 / I have searched on [Issue Tracker](https://github.com/3003h/FEhViewer/issues), No duplicate or related open issue has been found
required: true

- label: 您确保这个 Issue 只发起一个功能请求。如果您有多个功能请求,烦请发起多个 Issue / Ensure there is only one feature request in this issue. Please make mutiply issue for mutiply feature request
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ jobs:
run: find build/ios/Release-iphoneos -name "*.dSYM" | xargs -I \{\} ios/Pods/FirebaseCrashlytics/upload-symbols -gsp ios/Runner/GoogleService-Info.plist -p ios \{\}

- name: Thin app
run: sh scripts/thin-payload.sh build/ios/iphoneos/FEhViewer.app
run: sh scripts/thin-payload.sh build/ios/iphoneos/Eros-FE.app

- name: Build ipa
run: |
cd build
mkdir -p Payload
mv ios/iphoneos/FEhViewer.app Payload
zip -9 FEhViewer.ipa -r Payload
mv ios/iphoneos/Eros-FE.app Payload
zip -9 Eros-FE.ipa -r Payload
- name: Publish iOS Artifacts
uses: actions/upload-artifact@v3
with:
name: release-ios-nosign
path: build/FEhViewer.ipa
path: build/Eros-FE.ipa
4 changes: 2 additions & 2 deletions .github/workflows/build_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:

- name: Build App zip
run: |
$DestDir = "build\windows\FEhViewer"
$DestDir = "build\windows\Eros-FE"
$SrcDir = "build\windows\runner\Release"
New-Item -Path $DestDir -ItemType Directory
Copy-Item $SrcDir\* -Recurse $DestDir
Copy-Item -Filter *.dll -Path windows\* -Destination $DestDir -Force
Compress-Archive $DestDir build\windows\FEhViewer.zip
Compress-Archive $DestDir build\windows\Eros-FE.zip
- name: Publish Artifacts
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
--header 'Content-Type: application/x-www-form-urlencoded' \
-d parse_mode=markdown \
-d chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }} \
--data-urlencode text="[${{ github.ref_name }}](https://github.com/honjow/FEhViewer/releases/tag/${{ github.ref_name }})
--data-urlencode text="[${{ github.ref_name }}](https://github.com/honjow/Eros-FE/releases/tag/${{ github.ref_name }})
$changelog" \
-d disable_web_page_preview=true
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
cancel-in-progress: true

env:
PACKAGE_NAME: FEhViewer
PACKAGE_NAME: Eros-FE

jobs:
Build_and_upload:
Expand All @@ -33,32 +33,32 @@ jobs:
flutter_version: "3.x"
flutter_channel: stable
artifact_name: release-apk
artifact_path: build/app/outputs/apk/release/FEhViewer*.apk
artifact_path: build/app/outputs/apk/release/Eros-FE*.apk
- target: ios
os: macos-12
flutter_version: "3.x"
flutter_channel: stable
artifact_name: release-ios
artifact_path: build/**/FEhViewer*.ipa
artifact_path: build/**/Eros-FE*.ipa
- target: ios
suffix: -impeller
os: macos-12
flutter_version: "3.x"
flutter_channel: stable
artifact_name: release-ios-impeller
artifact_path: build/**/FEhViewer*.ipa
artifact_path: build/**/Eros-FE*.ipa
- target: macos
os: macos-12
flutter_version: "3.x"
flutter_channel: stable
artifact_name: release-mac
artifact_path: build/macos/FEhViewer*.zip
artifact_path: build/macos/Eros-FE*.zip
- target: windows
os: windows-latest
flutter_version: "3.x"
flutter_channel: stable
artifact_name: release-windows
artifact_path: build/windows/FEhViewer*.zip
artifact_path: build/windows/Eros-FE*.zip

runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -278,6 +278,6 @@ jobs:
# --header 'Content-Type: application/x-www-form-urlencoded' \
# -d parse_mode=markdown \
# -d chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }} \
# --data-urlencode text="[FEhViewer_${{ github.ref_name }}](https://github.com/honjow/FEhViewer/releases/tag/${{ github.ref_name }})
# --data-urlencode text="[Eros-FE_${{ github.ref_name }}](https://github.com/honjow/FEhViewer/releases/tag/${{ github.ref_name }})
# $changelog" \
# -d disable_web_page_preview=true
34 changes: 17 additions & 17 deletions .metadata
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: 135454af32477f815a7525073027a3ff9eff1bfd
channel: stable
revision: "ba393198430278b6595976de84fe170f553cc728"
channel: "stable"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: android
create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: ios
create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: linux
create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: macos
create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: web
create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: windows
create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728

# User provided section

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# FEhViewer
English | [简体中文](https://github.com/honjow/FEhViewer/blob/master/README_cn.md)
# Eros-FE
English | [简体中文](https://github.com/honjow/Eros-FE/blob/master/README_cn.md)

## Introduction

Expand All @@ -11,7 +11,7 @@ Please submit a pull request if you want to help with translation.
App Strings: `lib/l10n/{lang}.arb`

## Installation for iOS
1. Get the ipa file from [Releases](https://github.com/honjow/FEhViewer/releases/latest).
1. Get the ipa file from [Releases](https://github.com/honjow/Eros-FE/releases/latest).
2. Use some software like [AltStore](https://altstore.io) to install the ipa file on your device. Or [AltStore.json](https://config-feh.vercel.app/AltStore.json)

## Descriptions
Expand Down
6 changes: 3 additions & 3 deletions README_cn.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# FEhViewer
[English](https://github.com/honjow/FEhViewer/blob/master/README.md) | 简体中文
# Eros-FE
[English](https://github.com/honjow/Eros-FE/blob/master/README.md) | 简体中文

## 应用简介

一个 flutter 编写的 e-hentai app

## iOS 安装
1. 下载最新 ipa 文件 [Releases](https://github.com/honjow/FEhViewer/releases/latest).
1. 下载最新 ipa 文件 [Releases](https://github.com/honjow/Eros-FE/releases/latest).
2. 使用 [AltStore](https://altstore.io) 之类的 app 安装到设备上. 或者直接使用 [AltStore.json](https://config-feh.vercel.app/AltStore.json)


Expand Down
25 changes: 11 additions & 14 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
id 'com.google.gms.google-services'
id 'com.google.firebase.crashlytics'
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +14,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new Exception("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -34,15 +37,9 @@ def _keyPassword = System.getenv("KEY_PASSWORD") ?: keystoreProperties.getProper
def _storeFile = file(System.getenv("KEYSTORE") ?: keystoreProperties.getProperty("storeFile") ?: "keystore.jks")
def _storePassword = System.getenv("KEYSTORE_PASSWORD") ?: keystoreProperties.getProperty("storePassword")

apply plugin: 'com.android.application'
// START: FlutterFire Configuration
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
// END: FlutterFire Configuration
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
ndkVersion "25.2.9519653"
compileSdkVersion 34

sourceSets {
Expand All @@ -57,7 +54,7 @@ android {
// multiDexEnabled true
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
archivesBaseName = "FEhViewer_$versionName+$versionCode"
archivesBaseName = "Eros-FE_$versionName+$versionCode"
splits {
abi {
enable true
Expand Down Expand Up @@ -114,7 +111,7 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20"
implementation "androidx.startup:startup-runtime:1.1.1"
implementation 'com.google.mlkit:barcode-scanning:17.2.0'
}
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
FlutterApplication and put your custom class here. -->
<application
android:name="${applicationName}"
android:label="FEhViewer"
android:label="Eros-FE"
android:icon="@mipmap/ic_launcher"
android:localeConfig="@xml/locales_config" tools:targetApi="r">
<activity
Expand Down
36 changes: 36 additions & 0 deletions android/app/src/main/kotlin/com/honjow/eros_fe/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.honjow.eros_fe

import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.os.Build
import android.os.Bundle
import androidx.annotation.NonNull
import androidx.core.view.WindowCompat
import dev.darttools.flutter_android_volume_keydown.FlutterAndroidVolumeKeydownFragmentActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugins.GeneratedPluginRegistrant

class MainActivity: FlutterAndroidVolumeKeydownFragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

if (intent.getIntExtra("org.chromium.chrome.extra.TASK_ID", -1) == this.taskId) {
this.finish()
intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}

// Aligns the Flutter view vertically with the window.
WindowCompat.setDecorFitsSystemWindows(getWindow(), false)

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
// Disable the Android splash screen fade out animation to avoid
// a flicker before the similar frame is drawn in Flutter.
splashScreen.setOnExitAnimationListener { splashScreenView -> splashScreenView.remove() }
}

super.onCreate(savedInstanceState)
}

override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
}
}
Loading

0 comments on commit e859b60

Please sign in to comment.